Fix issues ThatRendle#207 and ThatRendle#201

ThatRendle · ThatRendle · commit e0c198ee6c8c · 2012-07-13T11:26:03.000+01:00
diff --git a/Simple.Data.BehaviourTest/Query/QueryTest.cs b/Simple.Data.BehaviourTest/Query/QueryTest.cs
@@ -228,7 +228,5 @@ public void SpecifyingJoinTableShouldCreateDirectQuery()
             GeneratedSqlIs("select [dbo].[userbio].[userid],[dbo].[userbio].[text] from [dbo].[userbio]" +
                 " join [dbo].[users] on ([dbo].[users].[id] = [dbo].[userbio].[userid]) where [dbo].[users].[id] = @p1");
         }
-
-        
     }
 }
diff --git a/Simple.Data.BehaviourTest/Query/WhereTest.cs b/Simple.Data.BehaviourTest/Query/WhereTest.cs
@@ -0,0 +1,52 @@
+namespace Simple.Data.IntegrationTest
+{
+    using System;
+    using Mocking.Ado;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class WhereTest : DatabaseIntegrationContext
+    {
+        [Test]
+        public void WhereWithNoParametersShouldThrowBadExpressionException()
+        {
+            Assert.Throws<BadExpressionException>(() => _db.Users.All().Where());
+        }
+
+        [Test]
+        public void WhereWithStringParameterShouldThrowBadExpressionException()
+        {
+            Assert.Throws<BadExpressionException>(() => _db.Users.All().Where("Answers"));
+        }
+
+        [Test]
+        public void WhereWithNullParameterShouldThrowArgumentNullException()
+        {
+            Assert.Throws<ArgumentNullException>(() => _db.Users.All().Where(null));
+        }
+
+        protected override void SetSchema(MockSchemaProvider schemaProvider)
+        {
+            schemaProvider.SetTables(new[] { "dbo", "Users", "BASE TABLE" },
+                                     new[] { "dbo", "UserBio", "BASE TABLE" },
+                                     new[] { "dbo", "UserPayment", "BASE TABLE" },
+                                     new[] { "dbo", "Employee", "BASE TABLE" });
+
+            schemaProvider.SetColumns(new object[] { "dbo", "Users", "Id", true },
+                                      new[] { "dbo", "Users", "Name" },
+                                      new[] { "dbo", "Users", "Password" },
+                                      new[] { "dbo", "Users", "Age" },
+                                      new[] { "dbo", "UserBio", "UserId" },
+                                      new[] { "dbo", "UserBio", "Text" },
+                                      new[] { "dbo", "UserPayment", "UserId" },
+                                      new[] { "dbo", "UserPayment", "Amount" },
+                                      new[] { "dbo", "Employee", "Id" },
+                                      new[] { "dbo", "Employee", "Name" },
+                                      new[] { "dbo", "Employee", "ManagerId" });
+
+            schemaProvider.SetPrimaryKeys(new object[] { "dbo", "Users", "Id", 0 });
+            schemaProvider.SetForeignKeys(new object[] { "FK_Users_UserBio", "dbo", "UserBio", "UserId", "dbo", "Users", "Id", 0 },
+                                          new object[] { "FK_Users_UserPayment", "dbo", "UserPayment", "UserId", "dbo", "Users", "Id", 0 });
+        }
+    }
+}
diff --git a/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj b/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj
@@ -78,6 +78,7 @@
     <Compile Include="Query\FunctionTest.cs" />
     <Compile Include="Query\HavingTest.cs" />
     <Compile Include="Query\QueryTest.cs" />
+    <Compile Include="Query\WhereTest.cs" />
     <Compile Include="Query\WithCountTest.cs" />
     <Compile Include="Query\WithTest.cs" />
     <Compile Include="RangeAndArrayFindTest.cs" />
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -183,6 +183,7 @@ public SimpleQuery ReplaceWhere(SimpleExpression criteria)
 
         public SimpleQuery Where(SimpleExpression criteria)
         {
+            if (criteria == null) throw new ArgumentNullException("criteria");
             return new SimpleQuery(this, _clauses.Append(new WhereClause(criteria)));
         }
 
@@ -333,7 +334,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
             }
             try
             {
-                var methodInfo = typeof(SimpleQuery).GetMethod(binder.Name);
+                var methodInfo = typeof(SimpleQuery).GetMethod(binder.Name, args.Select(a => (a ?? new object()).GetType()).ToArray());
                 if (methodInfo != null)
                 {
                     methodInfo.Invoke(this, args);
@@ -343,6 +344,11 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
             {
             }
 
+            if (binder.Name.Equals("where", StringComparison.InvariantCultureIgnoreCase) || binder.Name.Equals("replacewhere", StringComparison.InvariantCultureIgnoreCase))
+            {
+                throw new BadExpressionException("Where methods require a single criteria expression.");
+            }
+
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,5 @@ public void SpecifyingJoinTableShouldCreateDirectQuery()`
`228`	`228`	`GeneratedSqlIs("select [dbo].[userbio].[userid],[dbo].[userbio].[text] from [dbo].[userbio]" +`
`229`	`229`	`" join [dbo].[users] on ([dbo].[users].[id] = [dbo].[userbio].[userid]) where [dbo].[users].[id] = @p1");`
`230`	`230`	`}`
`231`		`-`
`232`		`-`
`233`	`231`	`}`
`234`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ public SimpleQuery ReplaceWhere(SimpleExpression criteria)`
`183`	`183`
`184`	`184`	`public SimpleQuery Where(SimpleExpression criteria)`
`185`	`185`	`{`
	`186`	`+ if (criteria == null) throw new ArgumentNullException("criteria");`
`186`	`187`	`return new SimpleQuery(this, _clauses.Append(new WhereClause(criteria)));`
`187`	`188`	`}`
`188`	`189`
`@@ -333,7 +334,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o`
`333`	`334`	`}`
`334`	`335`	`try`
`335`	`336`	`{`
`336`		`- var methodInfo = typeof(SimpleQuery).GetMethod(binder.Name);`
	`337`	`+ var methodInfo = typeof(SimpleQuery).GetMethod(binder.Name, args.Select(a => (a ?? new object()).GetType()).ToArray());`
`337`	`338`	`if (methodInfo != null)`
`338`	`339`	`{`
`339`	`340`	`methodInfo.Invoke(this, args);`
`@@ -343,6 +344,11 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o`
`343`	`344`	`{`
`344`	`345`	`}`
`345`	`346`
	`347`	`+ if (binder.Name.Equals("where", StringComparison.InvariantCultureIgnoreCase) \|\| binder.Name.Equals("replacewhere", StringComparison.InvariantCultureIgnoreCase))`
	`348`	`+ {`
	`349`	`+ throw new BadExpressionException("Where methods require a single criteria expression.");`
	`350`	`+ }`
	`351`	`+`
`346`	`352`	`return false;`
`347`	`353`	`}`
`348`	`354`