Merge branch 'develop' of github.com:supabase/postgres into drag/async_commence_backup

Author: dragarcia

.github/workflows/publish-nix-pgupgrade-scripts.yml

@@ -72,6 +72,9 @@ jobs:
         id: process_release_version
         run: |
           VERSION=$(grep 'postgres-version' common-nix.vars.pkr.hcl | sed -e 's/postgres-version = "\(.*\)"/\1/g')
+          if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
+            VERSION=${{ inputs.postgresVersion }}
+          fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Create a tarball containing pg_upgrade scripts

README.md

@@ -51,7 +51,7 @@ Aside from having [ufw](https://help.ubuntu.com/community/UFW),[fail2ban](https:
 | Goodie | Version | Description |
 | ------------- | :-------------: | ------------- |
 | [PgBouncer](https://www.pgbouncer.org/) | [1.16.1](http://www.pgbouncer.org/changelog.html#pgbouncer-116x) | Set up Connection Pooling. |
-| [PostgREST](https://postgrest.org/en/stable/) | [v10.1.1](https://github.com/PostgREST/postgrest/releases/tag/v10.1.1) | Instantly transform your database into an RESTful API. |
+| [PostgREST](https://postgrest.org/en/stable/) | [v12.2.3](https://github.com/PostgREST/postgrest/releases/tag/v12.2.3) | Instantly transform your database into an RESTful API. |
 | [WAL-G](https://github.com/wal-g/wal-g#wal-g) | [v2.0.1](https://github.com/wal-g/wal-g/releases/tag/v2.0.1) | Tool for physical database backup and recovery. |
 
 ## Install

ansible/files/admin_api_scripts/pg_upgrade_scripts/common.sh

@@ -356,7 +356,8 @@ begin
                        end
                      , case when rec.grantee = 'postgres'::regrole then 'supabase_admin'
                             when rec.grantee = 'supabase_admin'::regrole then 'postgres'
-                            else rec.grantee::regrole
+                            when rec.grantee = 0 then 'public'
+                            else rec.grantee::regrole::text
                        end
                      ));
       end if;
@@ -382,7 +383,7 @@ begin
                             when obj->>'objtype' = 'T' then 'types'
                             when obj->>'objtype' = 'n' then 'schemas'
                        end
-                     , rec.grantee::regrole
+                     , case when rec.grantee = 0 then 'public' else rec.grantee::regrole::text end
                      , case when rec.is_grantable then 'with grant option' else '' end
                      ));
       end if;
@@ -529,7 +530,14 @@ $$;
 alter database postgres connection limit -1;
 
 -- #incident-2024-09-12-project-upgrades-are-temporarily-disabled
-grant pg_read_all_data, pg_signal_backend to postgres;
+do $$
+begin
+  if exists (select from pg_authid where rolname = 'pg_read_all_data') then
+    execute('grant pg_read_all_data to postgres');
+  end if;
+end
+$$;
+grant pg_signal_backend to postgres;
 
 set session authorization supabase_admin;
 drop role supabase_tmp;

ansible/vars.yml

@@ -17,8 +17,8 @@ postgrest_release: "12.2.3"
 postgrest_arm_release_checksum: sha1:fbfd6613d711ce1afa25c42d5df8f1b017f396f9
 postgrest_x86_release_checksum: sha1:61c513f91a8931be4062587b9d4a18b42acf5c05
 
-gotrue_release: 2.161.0
-gotrue_release_checksum: sha1:8e45f3511fee8f99a0b1567c73673991a0a5986c
+gotrue_release: 2.162.0
+gotrue_release_checksum: sha1:855b23bd002577290c7d42d7042ac0f5316984b1
 
 aws_cli_release: "2.2.7"
 

common-nix.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.8.1.000"
+postgres-version = "15.8.1.001"

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.1.93"
+postgres-version = "15.1.1.94"

docker/all-in-one/entrypoint.sh

@@ -101,7 +101,7 @@ function setup_postgres {
   mv /etc/postgresql.schema.sql /docker-entrypoint-initdb.d/migrations/99-schema.sql
 
   tar -xzvf "$INIT_PAYLOAD_PATH" -C / ./etc/postgresql-custom/pgsodium_root.key
-  echo "include = '/etc/postgresql-custom/postgresql-platform-defaults.conf'" >>$PG_CONF
+  sed -i "/# Automatically generated optimizations/i # Supabase Platform Defaults\ninclude = '/etc/postgresql-custom/platform-defaults.conf'\n" $PG_CONF
 
   # TODO (darora): walg enablement is temporarily performed here until changes from https://github.com/supabase/postgres/pull/639 get picked up
   # other things will still be needed in the future (auth_delay config)

docker/all-in-one/etc/adminapi/adminapi.yaml

@@ -42,6 +42,13 @@ upstream_metrics_sources:
         value: {{ .ProjectRef }}
       - name: service_type
         value: gotrue
+  - name: postgrest
+    url: "http://localhost:3001/metrics"
+    labels_to_attach:
+      - name: supabase_project_ref
+        value: {{ .ProjectRef }}
+      - name: service_type
+        value: postgrest
 monitoring:
   disk_usage:
     enabled: true

docker/all-in-one/etc/postgresql-custom/postgresql-platform-defaults.conf

@@ -1,8 +1,6 @@
 # these get imported _after_ the user specified overrides
 row_security = on
 wal_level = logical
-max_wal_senders = 10
-max_replication_slots = 5
 log_connections = on
 statement_timeout = 120000
 jit = off

flake.nix

@@ -38,7 +38,6 @@
             # want to have an arbitrary order, since it might matter. being
             # explicit is better.
             (import ./nix/overlays/cargo-pgrx.nix)
-            (import ./nix/overlays/gdal-small.nix)
             (import ./nix/overlays/psql_16-oriole.nix)
 
           ];
@@ -68,15 +67,10 @@
               };
             })
             (import ./nix/overlays/cargo-pgrx-0-11-3.nix)
-            # (import ./nix/overlays/postgis.nix)
-            #(import ./nix/overlays/gdal-small.nix)
-
           ];
         };
         postgresql_15 = pkgs.postgresql.postgresql_15;
-        postgresql = pkgs.postgresql.postgresql_15;
         sfcgal = pkgs.callPackage ./nix/ext/sfcgal/sfcgal.nix { };
-        pg_regress = pkgs.callPackage ./nix/ext/pg_regress.nix { inherit postgresql; };
         supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
         mecab-naist-jdic = pkgs.callPackage ./nix/ext/mecab-naist-jdic/default.nix { };
         # Our list of PostgreSQL extensions which come from upstream Nixpkgs.
@@ -284,14 +278,41 @@
         # be used with 'nix build'. Don't use the names listed below; check the
         # name in 'nix flake show' in order to make sure exactly what name you
         # want.
-        basePackages = {
+        basePackages = let
+          # Function to get the PostgreSQL version from the attribute name
+          getVersion = name: 
+            let
+              match = builtins.match "psql_([0-9]+)" name;
+            in
+            if match == null then null else builtins.head match;
+
+          # Define the available PostgreSQL versions
+          postgresVersions = {
+            psql_15 = makePostgres "15";
+            # Uncomment the line below to enable PostgreSQL 16
+            # psql_16 = makePostgres "16";
+            # psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
+          };
+
+          # Find the active PostgreSQL version
+          activeVersion = getVersion (builtins.head (builtins.attrNames postgresVersions));
+
+          # Function to create the pg_regress package
+          makePgRegress = version:
+            let
+              postgresqlPackage = pkgs."postgresql_${version}";
+            in
+              pkgs.callPackage ./nix/ext/pg_regress.nix { 
+                postgresql = postgresqlPackage;
+              };
+
+        in 
+        postgresVersions //{
           supabase-groonga = supabase-groonga;
           # PostgreSQL versions.
           psql_15 = makePostgres "15";
-          #psql_16 = makePostgres "16";
           #psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
           sfcgal = sfcgal;
-          pg_regress = pg_regress;
           pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
           postgresql_15 = pkgs.postgresql_15;
 
@@ -319,6 +340,7 @@
           };
           mecab_naist_jdic = mecab-naist-jdic;
           supabase_groonga = supabase-groonga;
+          pg_regress = makePgRegress activeVersion;
           # Start a version of the server.
           start-server =
             let
@@ -455,6 +477,7 @@
             sqlTests = ./nix/tests/smoke;
             pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
             supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
+            pg_regress = basePackages.pg_regress;
           in
           pkgs.runCommand "postgres-${pgpkg.version}-check-harness"
             {