Fixes issue ThatRendle#266

ThatRendle · ThatRendle · commit 4a98b944fbbf · 2013-05-21T13:13:24.000+01:00
diff --git a/Simple.Data.BehaviourTest/GetCountTest.cs b/Simple.Data.BehaviourTest/GetCountTest.cs
@@ -24,6 +24,13 @@ public void GetCountBasic()
             GeneratedSqlIs("select count(*) from [dbo].[users]");
         }
 
+        [Test]
+        public void QueryCountBasic()
+        {
+            EatException<SimpleDataException>(() => _db.Users.All().Count());
+            GeneratedSqlIs("select count(*) from [dbo].[users]");
+        }
+
         [Test]
         public void GetCountByBasic()
         {
diff --git a/Simple.Data.BehaviourTest/Query/ExplicitJoinTest.cs b/Simple.Data.BehaviourTest/Query/ExplicitJoinTest.cs
@@ -293,7 +293,7 @@ public void PassingObjectReferenceToOnThrowsBadExpressionException()
         [Test]
         public void PassingTablesWrongWayRoundThrowsBadExpressionException()
         {
-            Assert.Throws<BadExpressionException>(
+            Assert.Throws<BadJoinExpressionException>(
                 () => _db.Activity.All().Join(_db.Activity, LocationId: _db.Location.ID_Location));
         }
 
diff --git a/Simple.Data/Commands/ExistsCommand.cs b/Simple.Data/Commands/ExistsCommand.cs
@@ -29,9 +29,21 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
         {
             var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());
 
-            if (args.Length == 1 && args[0] is SimpleExpression)
+            if (args.Length == 1)
             {
-                query = query.Where((SimpleExpression)args[0]);
+                var criteria = args[0] as SimpleExpression;
+                if (criteria != null)
+                {
+                    query = query.Where(criteria);
+                }
+                else
+                {
+                    throw new BadExpressionException(binder.Name + " requires an expression.");
+                }
+            }
+            else if (args.Length != 0)
+            {
+                throw new BadExpressionException(binder.Name + " requires an expression.");
             }
 
             return query.Exists();

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@ public void GetCountBasic()`
`24`	`24`	`GeneratedSqlIs("select count(*) from [dbo].[users]");`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ [Test]`
	`28`	`+ public void QueryCountBasic()`
	`29`	`+ {`
	`30`	`+ EatException<SimpleDataException>(() => _db.Users.All().Count());`
	`31`	`+ GeneratedSqlIs("select count(*) from [dbo].[users]");`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`[Test]`
`28`	`35`	`public void GetCountByBasic()`
`29`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public void PassingObjectReferenceToOnThrowsBadExpressionException()`
`293`	`293`	`[Test]`
`294`	`294`	`public void PassingTablesWrongWayRoundThrowsBadExpressionException()`
`295`	`295`	`{`
`296`		`- Assert.Throws<BadExpressionException>(`
	`296`	`+ Assert.Throws<BadJoinExpressionException>(`
`297`	`297`	`() => _db.Activity.All().Join(_db.Activity, LocationId: _db.Location.ID_Location));`
`298`	`298`	`}`
`299`	`299`