Merge branch 'master' into mv_gel_auth

geldata · Feb 6, 2025 · c42134d · c42134d
2 parents bcaf262 + 9ca3eaf
commit c42134d
Show file tree

Hide file tree

Showing 53 changed files with 2,150 additions and 173 deletions.
diff --git a/.github/workflows.src/tests-inplace.tpl.yml b/.github/workflows.src/tests-inplace.tpl.yml
@@ -1,6 +1,6 @@
 <% from "tests.inc.yml" import build, calc_cache_key, restore_cache -%>
 
-name: Tests of in-place upgrades
+name: Tests of in-place upgrades and patching
 
 on:
   schedule:
@@ -22,7 +22,7 @@ jobs:
         << calc_cache_key()|indent >>
     <%- endcall %>
 
-  test:
+  test-inplace:
     runs-on: ubuntu-latest
     needs: build
     strategy:
@@ -47,12 +47,23 @@ jobs:
       run: |
         ./tests/inplace-testing/test.sh ${{ matrix.flags }} vt ${{ matrix.tests }}
 
+  test-patches:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    <<- restore_cache() >>
+
+    - name: Test performing in-place upgrades
+      run: |
+        ./tests/patch-testing/test.sh test-dir -k test_link_on_target_delete -k test_edgeql_select -k test_edgeql_scope -k test_dump
+
   workflow-notifications:
     if: failure() && github.event_name != 'pull_request'
     name: Notify in Slack on failures
     needs:
       - build
-      - test
+      - test-inplace
+      - test-patches
     runs-on: ubuntu-latest
     permissions:
       actions: 'read'

diff --git a/.github/workflows/tests-inplace.yml b/.github/workflows/tests-inplace.yml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/edb/buildmeta.py b/edb/buildmeta.py
@@ -60,7 +60,7 @@
 # The merge conflict there is a nice reminder that you probably need
 # to write a patch in edb/pgsql/patches.py, and then you should preserve
 # the old value.
-EDGEDB_CATALOG_VERSION = 2024_01_28_00_00
+EDGEDB_CATALOG_VERSION = 2025_02_04_00_00
 EDGEDB_MAJOR_VERSION = 7
 
 

diff --git a/edb/common/ast/transformer.py b/edb/common/ast/transformer.py
@@ -64,6 +64,12 @@ def generic_visit(self, node):
             changes = {}
 
             for field, old_value in base.iter_fields(node, include_meta=False):
+                field_spec = node._fields[field]
+                if self.skip_hidden and field_spec.hidden:
+                    continue
+                if field in self.extra_skips:
+                    continue
+
                 old_value = getattr(node, field, None)
 
                 if typeutils.is_container(old_value):
@@ -79,6 +85,12 @@ def generic_visit(self, node):
 
         else:
             for field, old_value in base.iter_fields(node, include_meta=False):
+                field_spec = node._fields[field]
+                if self.skip_hidden and field_spec.hidden:
+                    continue
+                if field in self.extra_skips:
+                    continue
+
                 old_value = getattr(node, field, None)
 
                 if typeutils.is_container(old_value):

diff --git a/edb/edgeql/compiler/func.py b/edb/edgeql/compiler/func.py
@@ -479,6 +479,10 @@ def compile_FunctionCall(
 
 class ArgumentInliner(ast.NodeTransformer):
 
+    # Don't look through hidden nodes, they may contain references to nodes
+    # which should not be modified. For example, irast.Stmt.parent_stmt.
+    skip_hidden = True
+
     mapped_args: dict[irast.PathId, irast.PathId]
     inlined_arg_keys: list[int | str]
 

diff --git a/edb/ir/astexpr.py b/edb/ir/astexpr.py
@@ -63,7 +63,7 @@ def is_possibly_wrapped_distinct_expr(
     if not isinstance(tree, irast.SelectStmt):
         return None
 
-    return is_pure_distinct_expr(tree.result)
+    return is_set_expr(tree.result)
 
 
 def is_set_expr(tree: irast.Base) -> Optional[List[irast.Base]]: