Merge remote-tracking branch 'origin/master' into fix-net-gc

edb/edgeql/compiler/options.py

@@ -37,7 +37,7 @@
     SourceOrPathId = s_types.Type | s_pointers.Pointer | pathid.PathId
 
 
-@dataclass
+@dataclass(kw_only=True)
 class GlobalCompilerOptions:
     """Compiler toggles that affect compilation as a whole."""
 
@@ -102,7 +102,7 @@ class GlobalCompilerOptions:
     dump_restore_mode: bool = False
 
 
-@dataclass
+@dataclass(kw_only=True)
 class CompilerOptions(GlobalCompilerOptions):
 
     #: Module name aliases.

edb/pgsql/compiler/relgen.py

@@ -3323,7 +3323,13 @@ def _compile_func_epilogue(
         aspect=pgce.PathAspect.VALUE,
     )
 
-    aspects: Tuple[pgce.PathAspect, ...] = (pgce.PathAspect.VALUE,)
+    aspects: Tuple[pgce.PathAspect, ...]
+    if expr.body:
+        # For inlined functions, we want all of the aspects provided.
+        aspects = tuple(pathctx.list_path_aspects(func_rel, ir_set.path_id))
+    else:
+        # Otherwise we just know we have value.
+        aspects = (pgce.PathAspect.VALUE,)
 
     func_rvar = relctx.new_rel_rvar(ir_set, func_rel, ctx=ctx)
     relctx.include_rvar(
@@ -3605,6 +3611,12 @@ def process_set_as_func_expr(
             _compile_inlined_call_args(ir_set, ctx=newctx)
 
             set_expr = dispatch.compile(expr.body, ctx=newctx)
+            # Map the path id so that we can extract source aspects
+            # from it, which we want so that we can directly select
+            # from an INSERT instead of using overlays.
+            pathctx.put_path_id_map(
+                newctx.rel, ir_set.path_id, expr.body.path_id
+            )
 
         else:
             args = _compile_call_args(ir_set, ctx=newctx)

edb/pgsql/delta.py

@@ -1629,13 +1629,16 @@ def apply(
 
             if not overload:
                 variadic = func.get_params(schema).find_variadic(schema)
-                self.pgops.add(
-                    dbops.DropFunction(
-                        name=self.get_pgname(func, schema),
-                        args=self.compile_args(func, schema),
-                        has_variadic=variadic is not None,
+                if func.get_volatility(schema) != ql_ft.Volatility.Modifying:
+                    # Modifying functions are not compiled.
+                    # See: compile_edgeql_function
+                    self.pgops.add(
+                        dbops.DropFunction(
+                            name=self.get_pgname(func, schema),
+                            args=self.compile_args(func, schema),
+                            has_variadic=variadic is not None,
+                        )
                     )
-                )
 
         return super().apply(schema, context)
 
@@ -5370,10 +5373,10 @@ def _create_table(
 
         id = sn.QualName(
             module=prop.get_name(schema).module, name=str(prop.id))
-        index_name = common.convert_name(id, 'idx0', catenate=True)
+        index_name = common.convert_name(id, 'idx0', catenate=False)
 
         pg_index = dbops.Index(
-            name=index_name, table_name=new_table_name,
+            name=index_name[1], table_name=new_table_name,
             unique=False, columns=[src_col],
             metadata={'code': DEFAULT_INDEX_CODE},
         )

edb/pgsql/deltadbops.py

@@ -485,7 +485,13 @@ def create_constr_trigger_function(
         return [dbops.CreateFunction(func, or_replace=True)]
 
     def drop_constr_trigger_function(self, proc_name: Tuple[str, ...]):
-        return [dbops.DropFunction(name=proc_name, args=(), if_exists=True)]
+        return [dbops.DropFunction(
+            name=proc_name,
+            args=(),
+            # Use a condition instead of if_exists ot reduce annoying
+            # debug spew from postgres.
+            conditions=[dbops.FunctionExists(name=proc_name, args=())],
+        )]
 
     def create_constraint(self, constraint: SchemaConstraintTableConstraint):
         # Add the constraint normally to our table

edb/pgsql/metaschema.py

@@ -6479,15 +6479,16 @@ def _generate_sql_information_schema(
         SELECT attrelid,
             attname,
             atttypid,
+            attstattarget,
             attlen,
             attnum,
             attnum as attnum_internal,
             attndims,
             attcacheoff,
             atttypmod,
             attbyval,
-            attalign,
             attstorage,
+            attalign,
             attnotnull,
             atthasdef,
             atthasmissing,
@@ -6497,7 +6498,6 @@ def _generate_sql_information_schema(
             attislocal,
             attinhcount,
             attcollation,
-            attstattarget,
             attacl,
             attoptions,
             attfdwoptions,
@@ -6522,6 +6522,7 @@ def _generate_sql_information_schema(
         SELECT pc_oid as attrelid,
             col_name as attname,
             COALESCE(atttypid, 25) as atttypid, -- defaults to TEXT
+            COALESCE(attstattarget, -1) as attstattarget,
             COALESCE(attlen, -1) as attlen,
             (ROW_NUMBER() OVER (
                 PARTITION BY pc_oid
@@ -6532,8 +6533,8 @@ def _generate_sql_information_schema(
             COALESCE(attcacheoff, -1) as attcacheoff,
             COALESCE(atttypmod, -1) as atttypmod,
             COALESCE(attbyval, FALSE) as attbyval,
-            COALESCE(attalign, 'i') as attalign,
             COALESCE(attstorage, 'x') as attstorage,
+            COALESCE(attalign, 'i') as attalign,
             required as attnotnull,
             -- Always report no default, to avoid expr trouble
             false as atthasdef,
@@ -6544,7 +6545,6 @@ def _generate_sql_information_schema(
             COALESCE(attislocal, TRUE) as attislocal,
             COALESCE(attinhcount, 0) as attinhcount,
             COALESCE(attcollation, 0) as attcollation,
-            COALESCE(attstattarget, -1) as attstattarget,
             attacl,
             attoptions,
             attfdwoptions,
@@ -6645,14 +6645,15 @@ def _generate_sql_information_schema(
           attrelid,
           attname,
           atttypid,
+          attstattarget,
           attlen,
           attnum,
           attndims,
           attcacheoff,
           atttypmod,
           attbyval,
-          attalign,
           attstorage,
+          attalign,
           attnotnull,
           atthasdef,
           atthasmissing,
@@ -6662,7 +6663,6 @@ def _generate_sql_information_schema(
           attislocal,
           attinhcount,
           attcollation,
-          attstattarget,
           attacl,
           attoptions,
           attfdwoptions,

edb/server/bootstrap.py

@@ -1135,6 +1135,9 @@ async def create_branch(
         elif line.startswith('CREATE TYPE'):
             if any(skip in line for skip in to_skip):
                 skipping = True
+        elif line == 'SET transaction_timeout = 0;':
+            continue
+
         if skipping:
             continue
         new_lines.append(line)
@@ -1535,6 +1538,15 @@ def cleanup_tpldbdump(tpldbdump: bytes) -> bytes:
         flags=re.MULTILINE,
     )
 
+    # PostgreSQL 17 adds a transaction_timeout config setting that
+    # didn't exist on earlier versions.
+    tpldbdump = re.sub(
+        rb'^SET transaction_timeout = 0;$',
+        rb'',
+        tpldbdump,
+        flags=re.MULTILINE,
+    )
+
     return tpldbdump
 
 
@@ -2144,7 +2156,6 @@ async def _populate_misc_instance_data(
             json.dumps(json_single_role_metadata),
         )
 
-    assert backend_params.has_create_database
     if not backend_params.has_create_database:
         await _store_static_json_cache(
             ctx,

edb/server/compiler/__init__.py

@@ -30,9 +30,11 @@
 from .enums import InputFormat, OutputFormat
 from .explain import analyze_explain_output
 from .ddl import repair_schema
+from .rpc import CompilationRequest
 
 __all__ = (
     'Cardinality',
+    'CompilationRequest',
     'Compiler',
     'CompilerState',
     'CompileContext',