From: <ric...@us...> - 2009-11-08 10:58:56
|
Revision: 4824 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4824&view=rev Author: ricbrown Date: 2009-11-08 10:58:42 +0000 (Sun, 08 Nov 2009) Log Message: ----------- Minor change to QueryOver CreateAlias() syntax. Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs trunk/nhibernate/src/NHibernate/IQueryOver.cs trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-11-07 12:43:07 UTC (rev 4823) +++ trunk/nhibernate/src/NHibernate/Criterion/QueryOver.cs 2009-11-08 10:58:42 UTC (rev 4824) @@ -318,7 +318,7 @@ joinType)); } - public QueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias) + public QueryOver<T> JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias) { return AddAlias( ExpressionProcessor.FindMemberExpression(path.Body), @@ -326,7 +326,7 @@ JoinType.InnerJoin); } - public QueryOver<T> Join(Expression<Func<object>> path, Expression<Func<object>> alias) + public QueryOver<T> JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias) { return AddAlias( ExpressionProcessor.FindMemberExpression(path.Body), @@ -334,7 +334,7 @@ JoinType.InnerJoin); } - public QueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType) + public QueryOver<T> JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType) { return AddAlias( ExpressionProcessor.FindMemberExpression(path.Body), @@ -342,7 +342,7 @@ joinType); } - public QueryOver<T> Join(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType) + public QueryOver<T> JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType) { return AddAlias( ExpressionProcessor.FindMemberExpression(path.Body), @@ -558,17 +558,17 @@ IQueryOver<U> IQueryOver<T>.JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias, JoinType joinType) { return JoinQueryOver(path, alias, joinType); } - IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias) - { return Join(path, alias); } + IQueryOver<T> IQueryOver<T>.JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias) + { return JoinAlias(path, alias); } - IQueryOver<T> IQueryOver<T>.Join(Expression<Func<object>> path, Expression<Func<object>> alias) - { return Join(path, alias); } + IQueryOver<T> IQueryOver<T>.JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias) + { return JoinAlias(path, alias); } - IQueryOver<T> IQueryOver<T>.Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType) - { return Join(path, alias, joinType); } + IQueryOver<T> IQueryOver<T>.JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType) + { return JoinAlias(path, alias, joinType); } - IQueryOver<T> IQueryOver<T>.Join(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType) - { return Join(path, alias, joinType); } + IQueryOver<T> IQueryOver<T>.JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType) + { return JoinAlias(path, alias, joinType); } IQueryOverJoinBuilder<T> IQueryOver<T>.Inner { get { return new IQueryOverJoinBuilder<T>(this, JoinType.InnerJoin); } } Modified: trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs 2009-11-07 12:43:07 UTC (rev 4823) +++ trunk/nhibernate/src/NHibernate/Criterion/QueryOverJoinBuilder.cs 2009-11-08 10:58:42 UTC (rev 4824) @@ -113,14 +113,14 @@ this.joinType = joinType; } - public R Join(Expression<Func<T, object>> path, Expression<Func<object>> alias) + public R JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias) { - return (R)root.Join(path, alias, joinType); + return (R)root.JoinAlias(path, alias, joinType); } - public R Join(Expression<Func<object>> path, Expression<Func<object>> alias) + public R JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias) { - return (R)root.Join(path, alias, joinType); + return (R)root.JoinAlias(path, alias, joinType); } } Modified: trunk/nhibernate/src/NHibernate/IQueryOver.cs =================================================================== --- trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-11-07 12:43:07 UTC (rev 4823) +++ trunk/nhibernate/src/NHibernate/IQueryOver.cs 2009-11-08 10:58:42 UTC (rev 4824) @@ -317,7 +317,7 @@ /// <param name="path">Lambda expression returning association path</param> /// <param name="alias">Lambda expression returning alias reference</param> /// <returns>criteria instance</returns> - IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias); + IQueryOver<T> JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias); /// <summary> /// Join an association, assigning an alias to the joined entity @@ -325,7 +325,7 @@ /// <param name="path">Lambda expression returning association path</param> /// <param name="alias">Lambda expression returning alias reference</param> /// <returns>criteria instance</returns> - IQueryOver<T> Join(Expression<Func<object>> path, Expression<Func<object>> alias); + IQueryOver<T> JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias); /// <summary> /// Join an association, assigning an alias to the joined entity @@ -334,7 +334,7 @@ /// <param name="alias">Lambda expression returning alias reference</param> /// <param name="joinType">Type of join</param> /// <returns>criteria instance</returns> - IQueryOver<T> Join(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType); + IQueryOver<T> JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias, JoinType joinType); /// <summary> /// Join an association, assigning an alias to the joined entity @@ -343,7 +343,7 @@ /// <param name="alias">Lambda expression returning alias reference</param> /// <param name="joinType">Type of join</param> /// <returns>criteria instance</returns> - IQueryOver<T> Join(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType); + IQueryOver<T> JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias, JoinType joinType); IQueryOverJoinBuilder<T> Inner { get; } IQueryOverJoinBuilder<T> Left { get; } Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs =================================================================== --- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-11-07 12:43:07 UTC (rev 4823) +++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs 2009-11-08 10:58:42 UTC (rev 4824) @@ -270,8 +270,8 @@ Child childAlias = null; IQueryOver<Person> actual = CreateTestQueryOver<Person>() - .Join(p => p.Father, () => fatherAlias) - .Join(p => p.Children, () => childAlias); + .JoinAlias(p => p.Father, () => fatherAlias) + .JoinAlias(p => p.Children, () => childAlias); AssertCriteriaAreEqual(expected, actual); } @@ -289,8 +289,8 @@ Child childAlias = null; IQueryOver<Person> actual = CreateTestQueryOver<Person>(() => personAlias) - .Join(() => personAlias.Father, () => fatherAlias) - .Inner.Join(() => personAlias.Children, () => childAlias); + .JoinAlias(() => personAlias.Father, () => fatherAlias) + .Inner.JoinAlias(() => personAlias.Children, () => childAlias); AssertCriteriaAreEqual(expected, actual); } @@ -313,14 +313,14 @@ Relation collection1Alias = null, collection2Alias = null, collection3Alias = null, collection4Alias = null; IQueryOver<Relation> actual = CreateTestQueryOver<Relation>() - .Inner.Join(r => r.Related1, () => related1Alias) - .Inner.Join(r => r.Collection1, () => collection1Alias) - .Left.Join(r => r.Related2, () => related2Alias) - .Left.Join(r => r.Collection2, () => collection2Alias) - .Right.Join(r => r.Related3, () => related3Alias) - .Right.Join(r => r.Collection3, () => collection3Alias) - .Full.Join(r => r.Related4, () => related4Alias) - .Full.Join(r => r.Collection4, () => collection4Alias); + .Inner.JoinAlias(r => r.Related1, () => related1Alias) + .Inner.JoinAlias(r => r.Collection1, () => collection1Alias) + .Left.JoinAlias(r => r.Related2, () => related2Alias) + .Left.JoinAlias(r => r.Collection2, () => collection2Alias) + .Right.JoinAlias(r => r.Related3, () => related3Alias) + .Right.JoinAlias(r => r.Collection3, () => collection3Alias) + .Full.JoinAlias(r => r.Related4, () => related4Alias) + .Full.JoinAlias(r => r.Collection4, () => collection4Alias); AssertCriteriaAreEqual(expected, actual); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |