dialect/sqlgraph: fix neighbors check with predicates

Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/206

Reviewed By: alexsn

Differential Revision: D18729641

fbshipit-source-id: a5d333132ae276691ac8c1b084bc5d2037112529

dialect/sql/graph.go

@@ -237,13 +237,15 @@ func HasNeighborsWith(q *Selector, s *Step, pred func(*Selector)) {
 		}
 		from := q.Table()
 		to := builder.Table(s.To.Table)
-		join := builder.Table(s.Edge.Table)
-		matches := builder.Select(join.C(pk2)).
-			From(join).
+		edge := builder.Table(s.Edge.Table)
+		join := builder.Select(edge.C(pk2)).
+			From(edge).
 			Join(to).
-			On(join.C(pk1), to.C(s.To.Column))
+			On(edge.C(pk1), to.C(s.To.Column))
+		matches := builder.Select().From(to)
 		pred(matches)
-		q.Where(In(from.C(s.From.Column), matches))
+		join.FromSelect(matches)
+		q.Where(In(from.C(s.From.Column), join))
 	case r == M2O || (r == O2O && s.Edge.Inverse):
 		from := q.Table()
 		to := builder.Table(s.To.Table)

dialect/sql/graph_test.go

@@ -400,6 +400,26 @@ WHERE "groups"."id" IN
   JOIN "users" AS "t0" ON "user_groups"."user_id" = "t0"."id" WHERE "name" = $1)`,
 			wantArgs: []interface{}{"a8m"},
 		},
+		{
+			name: "M2M/inverse",
+			step: NewStep(
+				From("groups", "id"),
+				To("users", "id"),
+				Edge(M2M, true, "user_groups", "user_id", "group_id"),
+			),
+			selector: Dialect("postgres").Select("*").From(Table("groups")),
+			predicate: func(s *Selector) {
+				s.Where(And(NotNull("name"), EQ("name", "a8m")))
+			},
+			wantQuery: `
+SELECT *
+FROM "groups"
+WHERE "groups"."id" IN
+  (SELECT "user_groups"."group_id"
+  FROM "user_groups"
+  JOIN "users" AS "t0" ON "user_groups"."user_id" = "t0"."id" WHERE ("name" IS NOT NULL) AND ("name" = $1))`,
+			wantArgs: []interface{}{"a8m"},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {