Fix for issue ThatRendle#228

ThatRendle · ThatRendle · commit 149841f0de44 · 2012-11-06T15:28:20.000Z
diff --git a/Simple.Data.BehaviourTest/GetCountTest.cs b/Simple.Data.BehaviourTest/GetCountTest.cs
@@ -24,6 +24,20 @@ public void GetCountBasic()
             GeneratedSqlIs("select count(*) from [dbo].[users]");
         }
 
+        [Test]
+        public void GetCountByBasic()
+        {
+            EatException<SimpleDataException>(() => _db.Users.GetCountByAge(42));
+            GeneratedSqlIs("select count(*) from [dbo].[users] where [dbo].[users].[age] = @p1");
+        }
+
+        [Test]
+        public void GetCountByNamedParameters()
+        {
+            EatException<SimpleDataException>(() => _db.Users.GetCountBy(Age: 42));
+            GeneratedSqlIs("select count(*) from [dbo].[users] where [dbo].[users].[age] = @p1");
+        }
+
         [Test]
         public void GetCountWithColumnThrowsException()
         {
diff --git a/Simple.Data/Commands/GetCountByCommand.cs b/Simple.Data/Commands/GetCountByCommand.cs
@@ -27,7 +27,14 @@ public bool IsCommandFor(string method)
         /// <returns></returns>
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));
+            if (binder.Name.Equals("GetCountBy") || binder.Name.Equals("get_count_by"))
+            {
+                ArgumentHelper.CheckFindArgs(args, binder);
+            }
+
+            var criteriaDictionary = ArgumentHelper.CreateCriteriaDictionary(binder, args, "GetCountBy", "get_count_by");
+            var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(),
+                                                                                                  criteriaDictionary);
             return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteria).Count();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,14 @@ public bool IsCommandFor(string method)`
`27`	`27`	`/// <returns></returns>`
`28`	`28`	`public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)`
`29`	`29`	`{`
`30`		`- var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));`
	`30`	`+ if (binder.Name.Equals("GetCountBy") \|\| binder.Name.Equals("get_count_by"))`
	`31`	`+ {`
	`32`	`+ ArgumentHelper.CheckFindArgs(args, binder);`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ var criteriaDictionary = ArgumentHelper.CreateCriteriaDictionary(binder, args, "GetCountBy", "get_count_by");`
	`36`	`+ var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(),`
	`37`	`+ criteriaDictionary);`
`31`	`38`	`return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteria).Count();`
`32`	`39`	`}`
`33`	`40`	`}`