more parens, drop an __eq__ optimization

Author: msullivan

gel/_internal/_qb/_expressions.py

@@ -457,7 +457,7 @@ def __edgeql_expr__(self, *, ctx: ScopeContext) -> str:
                 rexpr=item,
                 type_=SchemaPath("std", "bool"),
             )
-        return f"FILTER {edgeql(fexpr, ctx=ctx)}"
+        return f"FILTER {edgeql_exprstmt(fexpr, ctx=ctx)}"
 
 
 class OrderDirection(_strenum.StrEnum):
@@ -529,7 +529,7 @@ def __edgeql_expr__(self, *, ctx: ScopeContext) -> str:
                 type_=SchemaPath("std", "bool"),
             )
 
-        return f"ORDER BY {edgeql(dexpr, ctx=ctx)}"
+        return f"ORDER BY {edgeql_exprstmt(dexpr, ctx=ctx)}"
 
 
 @dataclass(kw_only=True, frozen=True)
@@ -548,7 +548,7 @@ def __edgeql_expr__(self, *, ctx: ScopeContext) -> str:
         if isinstance(self.limit, IntLiteral) and self.limit.val == 1:
             return "LIMIT 1"
         else:
-            clause = edgeql(self.limit, ctx=ctx)
+            clause = edgeql_exprstmt(self.limit, ctx=ctx)
             return f"LIMIT {clause}"
 
 
@@ -564,7 +564,7 @@ def precedence(self) -> _edgeql.Precedence:
         return _edgeql.PRECEDENCE[_edgeql.Token.OFFSET]
 
     def __edgeql_expr__(self, *, ctx: ScopeContext) -> str:
-        return f"OFFSET {edgeql(self.offset, ctx=ctx)}"
+        return f"OFFSET {edgeql_exprstmt(self.offset, ctx=ctx)}"
 
 
 @dataclass(kw_only=True, frozen=True)
@@ -915,6 +915,17 @@ def get_object_type_splat(cls: type[GelTypeMetadata]) -> Shape:
     return shape
 
 
+def edgeql_exprstmt(
+    source: ExprCompatible,
+    *,
+    ctx: ScopeContext,
+) -> str:
+    res = edgeql(source, ctx=ctx)
+    if isinstance(source, Stmt):
+        res = f'({res})'
+    return res
+
+
 def toplevel_edgeql(
     x: ExprCompatible,
     *,

gel/_internal/_qb/_generics.py

@@ -316,9 +316,6 @@ def __infix_op__(
         *,
         swapped: bool = False,
     ) -> Any:
-        if op == "__eq__" and operand is self:
-            return True
-
         # Check for None comparison and raise appropriate error
         if operand is None and op in {"__eq__", "__ne__"}:
             _raise_op_error(_Op.IS_NONE if op == "__eq__" else _Op.IS_NOT_NONE)

tests/test_qb.py

@@ -628,6 +628,27 @@ def test_qb_for_01(self):
             {'Alice', 'Zoe', 'Billie', 'Dana', 'Cameron', 'Elsa'},
         )
 
+        res3 = self.client.query(
+            default.User.filter(
+                lambda u: std.for_(
+                    std.assert_exists(std.int64(0)),
+                    # HMMMMM
+                    lambda x: x == x,
+                )
+            )
+        )
+        self.assertEqual(len(res3), 6)
+
+        res4 = self.client.query(
+            default.User.filter(
+                lambda u: std.for_(
+                    u.name,
+                    lambda x: x == "Alice",
+                )
+            )
+        )
+        self.assertEqual(len(res4), 1)
+
 
 class TestQueryBuilderModify(tb.ModelTestCase):
     """This test suite is for data manipulation using QB."""