Fix for issue ThatRendle#184

ThatRendle · ThatRendle · commit 19d5d78b4967 · 2012-05-11T11:37:49.000+01:00
diff --git a/Simple.Data.Ado/ObjectName.cs b/Simple.Data.Ado/ObjectName.cs
@@ -57,7 +57,7 @@ public bool Equals(ObjectName other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
-            return Equals(other._schema, _schema) && Equals(other._name, _name);
+            return Equals(other._schema, _schema) && Equals(other._name, _name) && Equals(other._alias, _alias);
         }
 
         /// <summary>
@@ -86,7 +86,7 @@ public override int GetHashCode()
         {
             unchecked
             {
-                return ((_schema??string.Empty).GetHashCode()*397) ^ _name.GetHashCode();
+                return ((_schema??string.Empty).GetHashCode()*397) ^ (_name.GetHashCode()*397) ^ ((_alias??string.Empty).GetHashCode());
             }
         }
 
diff --git a/Simple.Data.Ado/QueryBuilder.cs b/Simple.Data.Ado/QueryBuilder.cs
@@ -223,7 +223,7 @@ private void HandleJoins()
             var fromHavingCriteria = joiner.GetJoinClauses(_tableName, _havingCriteria);
 
             var fromColumnList = _columns.Any(r => !(r is SpecialReference))
-                                     ? joiner.GetJoinClauses(_tableName, GetObjectReferences(_columns).Where(o => !joinClauses.Any(j => o.GetOwner().Equals(j.Table))), JoinType.Outer)
+                                     ? GetJoinClausesFromColumnList(joinClauses, joiner)
                                      : Enumerable.Empty<string>();
 
             var joinList = fromTable.Concat(fromJoins).Concat(fromCriteria).Concat(fromHavingCriteria).Concat(fromColumnList).Select(s => s.Trim()).Distinct().ToList();
@@ -246,6 +246,18 @@ private void HandleJoins()
             }
         }
 
+        private IEnumerable<string> GetJoinClausesFromColumnList(IEnumerable<JoinClause> joinClauses, Joiner joiner)
+        {
+            return joiner.GetJoinClauses(_tableName, GetObjectReferences(_columns)
+                .Where(o => !joinClauses.Any(j => ObjectReferenceIsInJoinClause(j, o))), JoinType.Outer);
+
+        }
+
+        private static bool ObjectReferenceIsInJoinClause(JoinClause clause, ObjectReference reference)
+        {
+            return reference.GetOwner().GetAliasOrName().Equals(clause.Table.GetAliasOrName());
+        }
+
         private IEnumerable<ObjectReference> GetObjectReferences(IEnumerable<SimpleReference> source)
         {
             var list = source.ToList();
diff --git a/Simple.Data.BehaviourTest/Query/WithTest.cs b/Simple.Data.BehaviourTest/Query/WithTest.cs
@@ -254,7 +254,7 @@ public void CriteriaReferencesShouldNotBeDuplicatedInSql()
         /// Test for issue #184
         /// </summary>
         [Test]
-        public void CriteriaReferencesShouldUseWithAlias()
+        public void CriteriaReferencesShouldUseWithAliasOutValue()
         {
             const string expectedSql = "select [dbo].[employee].[id],[dbo].[employee].[name]," +
                 "[dbo].[employee].[managerid],[dbo].[employee].[departmentid]," +
@@ -272,5 +272,29 @@ public void CriteriaReferencesShouldUseWithAlias()
 
             GeneratedSqlIs(expectedSql);
         }
+
+        /// <summary>
+        /// Test for issue #184
+        /// </summary>
+        [Test]
+        public void CriteriaReferencesShouldUseSeparateJoinFromWithAlias()
+        {
+            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] on ([dbo].[department].[id] = [dbo].[employee].[departmentid])" +
+                " left join [dbo].[department] [foo] on ([foo].[id] = [dbo].[employee].[departmentid])" +
+                " where ([dbo].[employee].[name] like @p1" +
+                " and [dbo].[department].[name] = @p2)";
+
+            var q = _db.Employees.Query()
+                .Where(_db.Employees.Name.Like("A%"))
+                .WithOne(_db.Employees.Department.As("Foo"))
+                .Where(_db.Employees.Department.Name == "Admin");
+            EatException(() => q.ToList());
+
+            GeneratedSqlIs(expectedSql);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public bool Equals(ObjectName other)`
`57`	`57`	`{`
`58`	`58`	`if (ReferenceEquals(null, other)) return false;`
`59`	`59`	`if (ReferenceEquals(this, other)) return true;`
`60`		`- return Equals(other._schema, _schema) && Equals(other._name, _name);`
	`60`	`+ return Equals(other._schema, _schema) && Equals(other._name, _name) && Equals(other._alias, _alias);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/// <summary>`
`@@ -86,7 +86,7 @@ public override int GetHashCode()`
`86`	`86`	`{`
`87`	`87`	`unchecked`
`88`	`88`	`{`
`89`		`- return ((_schema??string.Empty).GetHashCode()*397) ^ _name.GetHashCode();`
	`89`	`+ return ((_schema??string.Empty).GetHashCode()397) ^ (_name.GetHashCode()397) ^ ((_alias??string.Empty).GetHashCode());`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`