118: Fix natural joins where only the first of multiple joins were processed properly.

richardhopton · richardhopton · commit 50f0f54bb655 · 2011-11-20T20:01:02.000Z
diff --git a/Simple.Data.Ado/Joiner.cs b/Simple.Data.Ado/Joiner.cs
@@ -149,7 +149,7 @@ private static IEnumerable<ObjectReference> GetReferencesFromExpression(SimpleEx
             if (expression.Type == SimpleExpressionType.And || expression.Type == SimpleExpressionType.Or)
             {
                 return GetReferencesFromExpression((SimpleExpression)expression.LeftOperand)
-                    .Concat(GetReferencesFromExpression((SimpleExpression)expression.LeftOperand));
+                    .Concat(GetReferencesFromExpression((SimpleExpression)expression.RightOperand));
             }
 
             return Enumerable.Empty<ObjectReference>()
diff --git a/Simple.Data.SqlTest/NaturalJoinTest.cs b/Simple.Data.SqlTest/NaturalJoinTest.cs
@@ -31,5 +31,34 @@ public void CustomerDotOrdersDotOrderItemsDotItemDotNameShouldReturnOneRow()
                 Assert.AreEqual(1, order.OrderId);
             }
         }
+
+        [Test]
+        public void CustomerDotNameAndCustomerDotOrdersDotOrderItemsDotItemDotNameShouldReturnOneRow()
+        {
+            var db = DatabaseHelper.Open();
+            var customer = db.Customers.Find(db.Customers.Name == "Test" &&
+                                             db.Customers.Orders.OrderItems.Item.Name == "Widget");
+            Assert.IsNotNull(customer);
+            Assert.AreEqual("Test", customer.Name);
+            foreach (var order in customer.Orders)
+            {
+                Assert.AreEqual(1, order.OrderId);
+            }
+        }
+
+        [Test]
+        public void CustomerDotNameAndCustomerDotOrdersDotOrderDateAndCustomerDotOrdersDotOrderItemsDotItemDotNameShouldReturnOneRow()
+        {
+            var db = DatabaseHelper.Open();
+            var customer = db.Customers.Find(db.Customers.Name == "Test" &&
+                                             db.Customers.Orders.OrderDate == new DateTime(2010, 10, 10) &&
+                                             db.Customers.Orders.OrderItems.Item.Name == "Widget");
+            Assert.IsNotNull(customer);
+            Assert.AreEqual("Test", customer.Name);
+            foreach (var order in customer.Orders)
+            {
+                Assert.AreEqual(1, order.OrderId);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ private static IEnumerable<ObjectReference> GetReferencesFromExpression(SimpleEx`
`149`	`149`	`if (expression.Type == SimpleExpressionType.And \|\| expression.Type == SimpleExpressionType.Or)`
`150`	`150`	`{`
`151`	`151`	`return GetReferencesFromExpression((SimpleExpression)expression.LeftOperand)`
`152`		`- .Concat(GetReferencesFromExpression((SimpleExpression)expression.LeftOperand));`
	`152`	`+ .Concat(GetReferencesFromExpression((SimpleExpression)expression.RightOperand));`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`return Enumerable.Empty<ObjectReference>()`