Partial fix for issue ThatRendle#232

ThatRendle · ThatRendle · commit 547845625eb2 · 2013-05-21T12:43:45.000+01:00
diff --git a/Simple.Data.BehaviourTest/Query/ExplicitJoinTest.cs b/Simple.Data.BehaviourTest/Query/ExplicitJoinTest.cs
@@ -290,6 +290,13 @@ public void PassingObjectReferenceToOnThrowsBadExpressionException()
                 () => _db.Activity.All().Join(_db.Location).On(_db.Location.ID_Location));
         }
 
+        [Test]
+        public void PassingTablesWrongWayRoundThrowsBadExpressionException()
+        {
+            Assert.Throws<BadExpressionException>(
+                () => _db.Activity.All().Join(_db.Activity, LocationId: _db.Location.ID_Location));
+        }
+
         class Activity
         {
             public int ID_Activity { get; set; }
diff --git a/Simple.Data.SqlTest/SqlQueryPagerTest.cs b/Simple.Data.SqlTest/SqlQueryPagerTest.cs
@@ -86,7 +86,7 @@ public void ShouldCopeWithColumnsThatEndInFrom()
     from [dbo].[PromoPosts] 
     ORDER BY [dbo].[PromoPosts].[ActiveFrom]";
 
-            var expected = @"WITH __Data AS (SELECT [dbo].[PromoPosts].[Id],[dbo].[PromoPosts].[ActiveFrom],[dbo].[PromoPosts].[ActiveTo],[dbo].[PromoPosts].[Created],[dbo].[PromoPosts].[Updated],ROW_NUMBER() OVER(ORDER BY [dbo].[PromoPosts].[ActiveFrom]) AS [_#_] from [dbo].[PromoPosts]) SELECT [Id],[ActiveFrom],[ActiveTo],[Created],[Updated] FROM __Data WHERE [_#_] BETWEEN 1 AND 25";
+            var expected = @"with __data as (select [dbo].[promoposts].[id], row_number() over(order by [dbo].[promoposts].[activefrom]) as [_#_] from [dbo].[promoposts]) select [dbo].[promoposts].[id],[dbo].[promoposts].[activefrom],[dbo].[promoposts].[activeto],[dbo].[promoposts].[created],[dbo].[promoposts].[updated] from __data join [dbo].[promoposts] on [dbo].[promoposts].[id] = __data.[id] and [_#_] between 1 and 25";
             expected = expected.ToLowerInvariant();
 
             var pagedSql = new SqlQueryPager().ApplyPaging(sql, new[] {"[dbo].[PromoPosts].[Id]"}, 0, 25).Single();
diff --git a/Simple.Data/BadExpressionException.cs b/Simple.Data/BadExpressionException.cs
@@ -18,4 +18,20 @@ public BadExpressionException(string message, Exception inner) : base(message, i
         protected BadExpressionException(SerializationInfo info, StreamingContext context) : base(info, context)
         {}
     }
+    
+    [Serializable]
+    public class BadJoinExpressionException : BadExpressionException
+    {
+        public BadJoinExpressionException()
+        {}
+
+        public BadJoinExpressionException(string message) : base(message)
+        {}
+
+        public BadJoinExpressionException(string message, Exception inner) : base(message, inner)
+        {}
+
+        protected BadJoinExpressionException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {}
+    }
 }
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -599,7 +599,11 @@ private SimpleQuery ParseJoin(InvokeMemberBinder binder, object[] args)
                     tableToJoin = dynamicTable.ToObjectReference();
                 }
             }
-            if (tableToJoin == null) throw new InvalidOperationException();
+            if (tableToJoin == null) throw new BadJoinExpressionException("Incorrect join table specified");
+            if (HomogenizedEqualityComparer.DefaultInstance.Equals(tableToJoin.GetAliasOrName(), _tableName))
+            {
+                throw new BadJoinExpressionException("Cannot join unaliased table to itself.");
+            }
 
             SimpleExpression joinExpression = null;
 
@@ -613,7 +617,7 @@ private SimpleQuery ParseJoin(InvokeMemberBinder binder, object[] args)
                 joinExpression = args[1] as SimpleExpression;
             }
 
-            if (joinExpression == null) throw new InvalidOperationException();
+            if (joinExpression == null) throw new BadJoinExpressionException("Could not create join expression");
 
             var type = binder.Name.Equals("join", StringComparison.OrdinalIgnoreCase) ? JoinType.Inner : JoinType.Outer;
             var newJoin = new JoinClause(tableToJoin, type, joinExpression);

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,13 @@ public void PassingObjectReferenceToOnThrowsBadExpressionException()`
`290`	`290`	`() => _db.Activity.All().Join(_db.Location).On(_db.Location.ID_Location));`
`291`	`291`	`}`
`292`	`292`
	`293`	`+ [Test]`
	`294`	`+ public void PassingTablesWrongWayRoundThrowsBadExpressionException()`
	`295`	`+ {`
	`296`	`+ Assert.Throws<BadExpressionException>(`
	`297`	`+ () => _db.Activity.All().Join(_db.Activity, LocationId: _db.Location.ID_Location));`
	`298`	`+ }`
	`299`	`+`
`293`	`300`	`class Activity`
`294`	`301`	`{`
`295`	`302`	`public int ID_Activity { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,11 @@ private SimpleQuery ParseJoin(InvokeMemberBinder binder, object[] args)`
`599`	`599`	`tableToJoin = dynamicTable.ToObjectReference();`
`600`	`600`	`}`
`601`	`601`	`}`
`602`		`- if (tableToJoin == null) throw new InvalidOperationException();`
	`602`	`+ if (tableToJoin == null) throw new BadJoinExpressionException("Incorrect join table specified");`
	`603`	`+ if (HomogenizedEqualityComparer.DefaultInstance.Equals(tableToJoin.GetAliasOrName(), _tableName))`
	`604`	`+ {`
	`605`	`+ throw new BadJoinExpressionException("Cannot join unaliased table to itself.");`
	`606`	`+ }`
`603`	`607`
`604`	`608`	`SimpleExpression joinExpression = null;`
`605`	`609`
`@@ -613,7 +617,7 @@ private SimpleQuery ParseJoin(InvokeMemberBinder binder, object[] args)`
`613`	`617`	`joinExpression = args[1] as SimpleExpression;`
`614`	`618`	`}`
`615`	`619`
`616`		`- if (joinExpression == null) throw new InvalidOperationException();`
	`620`	`+ if (joinExpression == null) throw new BadJoinExpressionException("Could not create join expression");`
`617`	`621`
`618`	`622`	`var type = binder.Name.Equals("join", StringComparison.OrdinalIgnoreCase) ? JoinType.Inner : JoinType.Outer;`
`619`	`623`	`var newJoin = new JoinClause(tableToJoin, type, joinExpression);`