Merge branch 'develop' into sam/oriole-beta9

Author: samrose

.github/workflows/nix-build.yml

@@ -24,8 +24,6 @@ jobs:
             arch: arm64
           - runner: macos-latest
             arch: arm64
-          - runner: macos-13
-            arch: amd64
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 180
     steps:

ansible/files/postgresql_extension_custom_scripts/pgmq/after-create.sql

@@ -2,7 +2,9 @@ do $$
 declare
   extoid oid := (select oid from pg_extension where extname = 'pgmq');
   r record;
+  cls pg_class%rowtype;
 begin
+
   set local search_path = '';
 
 /*
@@ -136,15 +138,36 @@ alter extension pgmq add function pgmq.drop_queue;
 
 
   update pg_extension set extowner = 'postgres'::regrole where extname = 'pgmq';
+
   for r in (select * from pg_depend where refobjid = extoid) loop
+
+
     if r.classid = 'pg_type'::regclass then
-      execute(format('alter type %s owner to postgres;', r.objid::regtype));
+
+      -- store the type's relkind
+      select * into cls from pg_class c where c.reltype = r.objid;
+
+      if r.objid::regtype::text like '%[]' then
+        -- do nothing (skipping array type)
+
+      elsif cls.relkind in ('r', 'p', 'f', 'm') then
+        -- table-like objects (regular table, partitioned, foreign, materialized view)
+        execute format('alter table pgmq.%I owner to postgres;', cls.relname);
+
+      else
+        execute(format('alter type %s owner to postgres;', r.objid::regtype));
+
+      end if;
+
     elsif r.classid = 'pg_proc'::regclass then
       execute(format('alter function %s(%s) owner to postgres;', r.objid::regproc, pg_get_function_identity_arguments(r.objid)));
+
     elsif r.classid = 'pg_class'::regclass then
       execute(format('alter table %s owner to postgres;', r.objid::regclass));
+
     else
       raise exception 'error on pgmq after-create script: unexpected object type %', r.classid;
+
     end if;
   end loop;
 end $$;

ansible/tasks/test-image.yml

@@ -67,7 +67,7 @@
     - name: Remove specified extensions from SQL file
       ansible.builtin.command:
         cmd: >
-          sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\|pg_jsonschema\|pg_graphql\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
+          sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
       when: is_psql_oriole
       become: yes
 
@@ -76,11 +76,9 @@
         paths: /tmp/migrations/tests/extensions
         patterns: 
           - '*timescaledb*.sql'
+          - '*plv8*.sql'
           - '*postgis*.sql'
           - '*pgrouting*.sql'
-          - '*plv8*.sql'
-          - '*pg_jsonschema*.sql'
-          - '*pg_graphql*.sql'
       register: files_to_remove
       when: is_psql_oriole
 
@@ -91,29 +89,6 @@
       loop: "{{ files_to_remove.files }}"
       when: is_psql_oriole
       become: yes
-  
-    - name: Remove specified extensions from SQL file
-      ansible.builtin.command:
-        cmd: >
-          sed -i "/'pg_graphql',/d" /tmp/unit-tests/unit-test-01.sql
-      when: is_psql_oriole
-      become: yes
-
-    - name: Remove graphql schema test
-      lineinfile:
-        path: /tmp/migrations/tests/database/exists.sql
-        regexp: "^SELECT has_schema\\('graphql'\\);$"
-        state: absent
-      become: yes
-      when: is_psql_oriole
-
-    - name: Remove graphql schema test
-      lineinfile:
-        path: /tmp/migrations/tests/database/exists.sql
-        regexp: "^SELECT has_schema\\('graphql_public'\\);$"
-        state: absent
-      become: yes
-      when: is_psql_oriole
 
 - name: Run Unit tests (with filename unit-test-*) on Postgres Database
   shell: /usr/bin/pg_prove -U postgres -h localhost -d postgres -v /tmp/unit-tests/unit-test-*.sql

ansible/vars.yml

@@ -4,14 +4,12 @@ async_mode: true
 
 postgres_major:
   - "15"
-  - "16"
   - "orioledb-17"
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.018-orioledb"
-  postgres15: "15.8.1.028"
-  postgres16: "16.3.1.034"
+  postgresorioledb-17: "17.0.1.019-orioledb"
+  postgres15: "15.8.1.029"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

docker/nix/build_nix.sh

@@ -9,33 +9,21 @@ fi
 SYSTEM=$(nix-instantiate --eval -E builtins.currentSystem | tr -d '"')
 
 nix build .#checks.$SYSTEM.psql_15 -L --no-link
-nix build .#checks.$SYSTEM.psql_16 -L --no-link
-
+nix build .#checks.$SYSTEM.psql_orioledb-17 -L --no-link
 nix build .#psql_15/bin -o psql_15
-nix build .#psql_16/bin -o psql_16
 
-# Skip orioledb-17 on x86_64-darwin
-if [ "$SYSTEM" != "x86_64-darwin" ]; then
-    nix build .#psql_orioledb-17/bin -o psql_orioledb_17
-fi
+nix build .#psql_orioledb-17/bin -o psql_orioledb_17
 
 # Copy to S3
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_15
-nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_16
-if [ "$SYSTEM" != "x86_64-darwin" ]; then
-    nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_17
-fi
+nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_17
 if [ "$SYSTEM" = "aarch64-linux" ]; then
     nix build .#postgresql_15_debug -o ./postgresql_15_debug
     nix build .#postgresql_15_src -o ./postgresql_15_src
-    nix build .#postgresql_16_debug -o ./postgresql_16_debug
-    nix build .#postgresql_16_src -o ./postgresql_16_src
     nix build .#postgresql_orioledb-17_debug -o ./postgresql_orioledb-17_debug
     nix build .#postgresql_orioledb-17_src -o ./postgresql_orioledb-17_src
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./postgresql_15_debug-debug
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./postgresql_15_src
-    nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./postgresql_16_debug-debug
-    nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./postgresql_16_src
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./postgresql_orioledb-17_debug-debug
     nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key  ./postgresql_orioledb-17_src
 fi