Skip to content

Commit 1d83bcc

Browse files
fabiomaulofabiomaulo
committed
BREAKING CHANGE:
- Name space renamed from NH1.2.1 Expression to Criterion The same namespace was changed before in the trunk from "Expression" to "Expressions". Using "Criterion" we are using the same H3.2 package name SVN: trunk@3342
1 parent 63f6342 commit 1d83bcc

File tree

124 files changed

+398
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+398
-407
lines changed

‎src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections;
3+
using NHibernate.Criterion;
34
using NUnit.Framework;
45

56
namespace NHibernate.Test.CompositeId
@@ -95,7 +96,7 @@ public void TestSimpleCRUD()
9596
Assert.AreEqual(id, theClass2.Id);
9697

9798
IList results2 = s2.CreateCriteria(typeof(ClassWithCompositeId))
98-
.Add(Expressions.Expression.Eq("Id", secondId))
99+
.Add(Expression.Eq("Id", secondId))
99100
.List();
100101

101102
Assert.AreEqual(1, results2.Count);
@@ -155,7 +156,7 @@ public void TestSimpleCRUD()
155156
}
156157

157158
IList results = s4.CreateCriteria(typeof(ClassWithCompositeId))
158-
.Add(Expressions.Expression.Eq("Id", secondId))
159+
.Add(Expression.Eq("Id", secondId))
159160
.List();
160161

161162
Assert.AreEqual(0, results.Count);
@@ -179,7 +180,7 @@ public void Criteria()
179180

180181
s = OpenSession();
181182
ICriteria c = s.CreateCriteria(typeof(ClassWithCompositeId));
182-
c.Add(Expressions.Expression.Eq("Id", id));
183+
c.Add(Expression.Eq("Id", id));
183184

184185
// right now just want to see if the Criteria is valid
185186
IList results = c.List();

‎src/NHibernate.Test/Criteria/AddNumberProjection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace NHibernate.Test.Criteria
22
{
33
using System.Collections.Generic;
44
using Engine;
5-
using Expressions;
5+
using Criterion;
66
using SqlCommand;
77
using Type;
88

‎src/NHibernate.Test/Criteria/CriteriaQueryTest.cs

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections;
33
using NHibernate.Dialect;
4-
using NHibernate.Expressions;
4+
using NHibernate.Criterion;
55
using NHibernate.SqlCommand;
66
using NHibernate.Transform;
77
using NHibernate.Type;
@@ -355,7 +355,7 @@ public void ProjectionCache()
355355
IList list = s.CreateCriteria(typeof(Enrolment))
356356
.CreateAlias("Student", "s")
357357
.CreateAlias("Course", "c")
358-
.Add(Expressions.Expression.IsNotEmpty("s.Enrolments"))
358+
.Add(Expression.IsNotEmpty("s.Enrolments"))
359359
.SetProjection(Projections.ProjectionList()
360360
.Add(Projections.Property("s.Name"))
361361
.Add(Projections.Property("c.Description")))
@@ -375,7 +375,7 @@ public void ProjectionCache()
375375
s.CreateCriteria(typeof(Enrolment))
376376
.CreateAlias("Student", "s")
377377
.CreateAlias("Course", "c")
378-
.Add(Expressions.Expression.IsNotEmpty("s.Enrolments"))
378+
.Add(Expression.IsNotEmpty("s.Enrolments"))
379379
.SetProjection(Projections.ProjectionList()
380380
.Add(Projections.Property("s.Name"))
381381
.Add(Projections.Property("c.Description")))
@@ -395,7 +395,7 @@ public void ProjectionCache()
395395
s.CreateCriteria(typeof(Enrolment))
396396
.CreateAlias("Student", "s")
397397
.CreateAlias("Course", "c")
398-
.Add(Expressions.Expression.IsNotEmpty("s.Enrolments"))
398+
.Add(Expression.IsNotEmpty("s.Enrolments"))
399399
.SetProjection(Projections.ProjectionList()
400400
.Add(Projections.Property("s.Name"))
401401
.Add(Projections.Property("c.Description")))
@@ -573,8 +573,8 @@ public void ProjectionsTest()
573573
.Add(Projections.Property("StudentNumber"), "stNumber")
574574
.Add(Projections.Property("CourseCode"), "cCode"))
575575
)
576-
.Add(Expressions.Expression.Gt("StudentNumber", 665L))
577-
.Add(Expressions.Expression.Lt("StudentNumber", 668L))
576+
.Add(Expression.Gt("StudentNumber", 665L))
577+
.Add(Expression.Lt("StudentNumber", 668L))
578578
.AddOrder(Order.Asc("stNumber"))
579579
.SetResultTransformer(CriteriaUtil.AliasToEntityMap)
580580
.List();
@@ -617,7 +617,7 @@ public void ProjectionsTest()
617617
Assert.IsNotNull(dto.Name);
618618

619619
s.CreateCriteria(typeof(Student))
620-
.Add(Expressions.Expression.Like("Name", "Gavin", MatchMode.Start))
620+
.Add(Expression.Like("Name", "Gavin", MatchMode.Start))
621621
.AddOrder(Order.Asc("Name"))
622622
.CreateCriteria("Enrolments", "e")
623623
.AddOrder(Order.Desc("Year"))
@@ -666,7 +666,7 @@ public void ProjectionsTest()
666666
Assert.AreEqual(2, list.Count);
667667

668668
object g = s.CreateCriteria(typeof(Student))
669-
.Add(Expressions.Expression.IdEq(667L))
669+
.Add(Expression.IdEq(667L))
670670
.SetFetchMode("enrolments", FetchMode.Join)
671671
//.setFetchMode("enrolments.course", FetchMode.JOIN) //TODO: would love to make that work...
672672
.UniqueResult();
@@ -751,8 +751,8 @@ public void CloningProjectionsTest()
751751
.Add(Projections.Property("StudentNumber"), "stNumber")
752752
.Add(Projections.Property("CourseCode"), "cCode"))
753753
)
754-
.Add(Expressions.Expression.Gt("StudentNumber", 665L))
755-
.Add(Expressions.Expression.Lt("StudentNumber", 668L))
754+
.Add(Expression.Gt("StudentNumber", 665L))
755+
.Add(Expression.Lt("StudentNumber", 668L))
756756
.AddOrder(Order.Asc("stNumber"))
757757
.SetResultTransformer(CriteriaUtil.AliasToEntityMap);
758758
IList resultWithMaps = CriteriaTransformer.Clone(criteriaToClone2)
@@ -798,7 +798,7 @@ public void CloningProjectionsTest()
798798
Assert.IsNotNull(dto.Name);
799799

800800
ICriteria complexCriteriaToBeCloned = s.CreateCriteria(typeof(Student))
801-
.Add(Expressions.Expression.Like("Name", "Gavin", MatchMode.Start))
801+
.Add(Expression.Like("Name", "Gavin", MatchMode.Start))
802802
.AddOrder(Order.Asc("Name"))
803803
.CreateCriteria("Enrolments", "e")
804804
.AddOrder(Order.Desc("Year"))
@@ -850,7 +850,7 @@ public void CloningProjectionsTest()
850850
Assert.AreEqual(2, list.Count);
851851

852852
ICriteria criteriaToClone6 = s.CreateCriteria(typeof(Student))
853-
.Add(Expressions.Expression.IdEq(667L))
853+
.Add(Expression.IdEq(667L))
854854
.SetFetchMode("enrolments", FetchMode.Join);
855855
object g = CriteriaTransformer.Clone(criteriaToClone6)
856856
.UniqueResult();
@@ -984,7 +984,7 @@ public void ProjectionsUsingProperty()
984984
Assert.IsNotNull(dto.Name);
985985

986986
s.CreateCriteria(typeof(Student))
987-
.Add(Expressions.Expression.Like("Name", "Gavin", MatchMode.Start))
987+
.Add(Expression.Like("Name", "Gavin", MatchMode.Start))
988988
.AddOrder(Order.Asc("Name"))
989989
.CreateCriteria("Enrolments", "e")
990990
.AddOrder(Order.Desc("Year"))
@@ -1167,7 +1167,7 @@ public void CloningProjectionsUsingProperty()
11671167
Assert.IsNotNull(dto.Name);
11681168

11691169
ICriteria complexCriteriaWithProjections = s.CreateCriteria(typeof(Student))
1170-
.Add(Expressions.Expression.Like("Name", "Gavin", MatchMode.Start))
1170+
.Add(Expression.Like("Name", "Gavin", MatchMode.Start))
11711171
.AddOrder(Order.Asc("Name"))
11721172
.CreateCriteria("Enrolments", "e")
11731173
.AddOrder(Order.Desc("Year"))
@@ -1232,11 +1232,11 @@ public void RestrictionOnSubclassCollection()
12321232
ITransaction t = s.BeginTransaction();
12331233

12341234
s.CreateCriteria(typeof(Reptile))
1235-
.Add(Expressions.Expression.IsEmpty("offspring"))
1235+
.Add(Expression.IsEmpty("offspring"))
12361236
.List();
12371237

12381238
s.CreateCriteria(typeof(Reptile))
1239-
.Add(Expressions.Expression.IsNotEmpty("offspring"))
1239+
.Add(Expression.IsNotEmpty("offspring"))
12401240
.List();
12411241

12421242
t.Rollback();
@@ -1416,7 +1416,7 @@ public void TypeMismatch()
14161416
using (ISession session = OpenSession())
14171417
{
14181418
session.CreateCriteria(typeof(Enrolment))
1419-
.Add(Expressions.Expression.Eq("Student", 10)) // Type mismatch!
1419+
.Add(Expression.Eq("Student", 10)) // Type mismatch!
14201420
.List();
14211421
}
14221422
}

0 commit comments

Comments
 (0)