Fix some missing parenthesization (#895)

Author: msullivan

gel/_internal/_qb/_expressions.py

@@ -222,7 +222,10 @@ def __edgeql_expr__(self, *, ctx: ScopeContext) -> str:
             steps.append(step)
             current = source
 
-        steps.append(edgeql(current, ctx=ctx))
+        base = edgeql(current, ctx=ctx)
+        if not isinstance(current, AtomicExpr):
+            base = f"({base})"
+        steps.append(base)
 
         return "".join(reversed(steps))
 
@@ -868,6 +871,10 @@ def _need_left_parens(
 ) -> bool:
     if isinstance(lexpr, AtomicExpr):
         return False
+    # FIXME?: This is true up until 7.0. Before 7.0 we usually need
+    # to parenthesize statements, but afterward not.
+    if isinstance(lexpr, Stmt):
+        return True
     left_prec = lprec if lprec is not None else lexpr.precedence
     return _edgeql.need_left_parens(prod_prec, left_prec)
 
@@ -879,6 +886,10 @@ def _need_right_parens(
 ) -> bool:
     if isinstance(rexpr, AtomicExpr):
         return False
+    # FIXME?: This is true up until 7.0. Before 7.0 we usually need
+    # to parenthesize statements, but afterward not.
+    if isinstance(rexpr, Stmt):
+        return True
     right_prec = rprec if rprec is not None else rexpr.precedence
     return _edgeql.need_right_parens(prod_prec, right_prec)
 

tests/test_qb.py

@@ -323,12 +323,12 @@ def test_qb_filter_08(self):
         self.assertEqual(post.author.name, "Elsa")
         self.assertEqual(post.body, "*magic stuff*")
 
-    @tb.xfail
+    @tb.skip_typecheck  # FIXME: array equality busted
     def test_qb_filter_09(self):
         from models.orm import default, std
 
         # Find GameSession with same players as the green group
-        green = default.UserGroup.filter(name="green")
+        green = default.UserGroup.select(users=True).filter(name="green")
         q = default.GameSession.select(
             "*",
             players=True,
@@ -337,27 +337,31 @@ def test_qb_filter_09(self):
             == std.array_agg(green.users.id)
         )
 
+        self.assertEqual(1, 2)
         res = self.client.get(q)
+        green_res = self.client.get(green)
         self.assertEqual(res.num, 123)
         self.assertEqual(
-            {u.id for u in res.players}, {u.id for u in green.users}
+            {u.id for u in res.players},
+            {u.id for u in green_res.users},
         )
 
-    @tb.xfail
     def test_qb_filter_10(self):
         from models.orm import default, std
 
         # Find GameSession with same *number* of players as the green group
-        green = default.UserGroup.filter(name="green")
+        green = default.UserGroup.select(users=True).filter(name="green")
         q = default.GameSession.select(
             "*",
             players=True,
         ).filter(lambda g: std.count(g.players) == std.count(green.users))
 
         res = self.client.get(q)
+        green_res = self.client.get(green)
         self.assertEqual(res.num, 123)
         self.assertEqual(
-            {u.id for u in res.players}, {u.id for u in green.users}
+            {u.id for u in res.players},
+            {u.id for u in green_res.users},
         )
 
     def test_qb_link_property_01(self):