Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4856] trunk/nhibernate/src/NHibernate
|
From: <ric...@us...> - 2009-11-23 18:00:28
|
Revision: 4856
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4856&view=rev
Author: ricbrown
Date: 2009-11-23 18:00:21 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Moved creation of detached QueryOver of T to a factory method.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs
trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -19,6 +19,16 @@
protected QueryOver() { }
+ public static QueryOver<T> Of<T>()
+ {
+ return new QueryOver<T>();
+ }
+
+ public static QueryOver<T> Of<T>(Expression<Func<T>> alias)
+ {
+ return new QueryOver<T>(alias);
+ }
+
public ICriteria UnderlyingCriteria
{
get { return _criteria; }
@@ -38,13 +48,13 @@
public class QueryOver<T> : QueryOver, IQueryOver<T>
{
- public QueryOver()
+ protected internal QueryOver()
{
_impl = new CriteriaImpl(typeof(T), null);
_criteria = _impl;
}
- public QueryOver(Expression<Func<T>> alias)
+ protected internal QueryOver(Expression<Func<T>> alias)
{
string aliasPath = ExpressionProcessor.FindMemberExpression(alias.Body);
_impl = new CriteriaImpl(typeof(T), aliasPath, null);
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -81,7 +81,7 @@
using (ISession s = OpenSession())
{
QueryOver<Person> personQuery =
- new QueryOver<Person>()
+ QueryOver.Of<Person>()
.Where(p => p.Name == "test person 1");
IList<Person> actual =
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/ProjectionsFixture.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -27,7 +27,7 @@
get
{
return
- new QueryOver<Child>(() => _subqueryChildAlias)
+ QueryOver.Of<Child>(() => _subqueryChildAlias)
.Where(() => _subqueryChildAlias.Nickname == "subquery name")
.Select(p => p.Age);
}
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -477,7 +477,7 @@
Person personAlias = null;
QueryOver<Person> actual =
- new QueryOver<Person>(() => personAlias)
+ QueryOver.Of<Person>(() => personAlias)
.Where(() => personAlias.Name == "test name");
AssertCriteriaAreEqual(expected, actual);
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/RestrictionsFixture.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -158,7 +158,7 @@
Person personAlias = null;
QueryOver<Person> actual =
- new QueryOver<Person>(() => personAlias)
+ QueryOver.Of<Person>(() => personAlias)
.WhereRestrictionOn(p => p.Age).IsBetween(18).And(65)
.WhereRestrictionOn(() => personAlias.Age).IsBetween(18).And(65)
.AndRestrictionOn(p => p.Name).IsIn(new string[] { "name1", "name2", "name3" })
Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs 2009-11-23 17:38:07 UTC (rev 4855)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/SubqueryFixture.cs 2009-11-23 18:00:21 UTC (rev 4856)
@@ -47,7 +47,7 @@
get
{
return
- new QueryOver<Child>(() => _subqueryChildAlias)
+ QueryOver.Of<Child>(() => _subqueryChildAlias)
.Where(() => _subqueryChildAlias.Nickname == "subquery name");
}
}
@@ -57,7 +57,7 @@
get
{
return
- new QueryOver<Child>(() => _subqueryChildAlias)
+ QueryOver.Of<Child>(() => _subqueryChildAlias)
.Where(() => _subqueryChildAlias.Nickname == "subquery name")
.Select(p => p.Nickname);
}
@@ -68,7 +68,7 @@
get
{
return
- new QueryOver<Child>(() => _subqueryChildAlias)
+ QueryOver.Of<Child>(() => _subqueryChildAlias)
.Where(() => _subqueryChildAlias.Nickname == "subquery name")
.Select(p => p.Age);
}
@@ -112,7 +112,7 @@
Person personAlias = null;
QueryOver<Person> actual =
- new QueryOver<Person>(() => personAlias)
+ QueryOver.Of<Person>(() => personAlias)
.WithSubquery.WhereProperty(p => p.Name).Eq(DetachedQueryOverName)
.WithSubquery.WhereProperty(() => personAlias.Name).Eq(DetachedQueryOverName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
