Added out parameter on With methods to fix ThatRendle#184

ThatRendle · ThatRendle · commit 09e979fe5dd9 · 2012-05-11T11:14:42.000+01:00
diff --git a/Simple.Data.BehaviourTest/Query/WithTest.cs b/Simple.Data.BehaviourTest/Query/WithTest.cs
@@ -249,5 +249,28 @@ public void CriteriaReferencesShouldNotBeDuplicatedInSql()
 
             GeneratedSqlIs(expectedSql);
         }
+        
+        /// <summary>
+        /// Test for issue #184
+        /// </summary>
+        [Test]
+        public void CriteriaReferencesShouldUseWithAlias()
+        {
+            const string expectedSql = "select [dbo].[employee].[id],[dbo].[employee].[name]," +
+                "[dbo].[employee].[managerid],[dbo].[employee].[departmentid]," +
+                "[foo].[id] as [__with1__foo__id],[foo].[name] as [__with1__foo__name]" +
+                " from [dbo].[employee] join [dbo].[department] [foo] on ([foo].[id] = [dbo].[employee].[departmentid])" +
+                " where ([dbo].[employee].[name] like @p1" +
+                " and [foo].[name] = @p2)";
+
+            dynamic foo;
+            var q = _db.Employees.Query()
+                .Where(_db.Employees.Name.Like("A%"))
+                .WithOne(_db.Employees.Department.As("Foo"), out foo)
+                .Where(foo.Name == "Admin");
+            EatException(() => q.ToList());
+
+            GeneratedSqlIs(expectedSql);
+        }
     }
 }
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -327,11 +327,22 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
             return false;
         }
 
-        private static bool MethodIsCallable(MethodInfo mi, InvokeMemberBinder binder, object[] args)
+        public SimpleQuery With(ObjectReference reference, out dynamic queryObjectReference)
         {
-            return mi.Name.Equals(binder.Name, StringComparison.OrdinalIgnoreCase) &&
-                   mi.GetParameters().Length == 1 &&
-                   Convert.ChangeType(args, mi.GetParameters().Single().ParameterType) != null;
+            queryObjectReference = reference;
+            return With(new[] {reference});
+        }
+
+        public SimpleQuery WithOne(ObjectReference reference, out dynamic queryObjectReference)
+        {
+            queryObjectReference = reference;
+            return With(new[] {reference}, WithType.One);
+        }
+
+        public SimpleQuery WithMany(ObjectReference reference, out dynamic queryObjectReference)
+        {
+            queryObjectReference = reference;
+            return With(new[] {reference}, WithType.Many);
         }
 
         private SimpleQuery ParseWith(InvokeMemberBinder binder, object[] args)
