Merge branch 'develop' into sam/oriole16

samrose · web-flow · commit 6336dba7f10f · 2024-10-17T10:10:03.000-04:00
diff --git a/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml b/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml
@@ -43,6 +43,9 @@ jobs:
         run: |
           VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
           VERSION=$(echo $PG_VERSION | tr -d '"')  # Remove any surrounding quotes
+          if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
+            VERSION=${{ inputs.postgresVersion }}
+          fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "major_version=$(echo $VERSION | cut -d'.' -f1)" >> "$GITHUB_OUTPUT"
 
diff --git a/.github/workflows/publish-nix-pgupgrade-scripts.yml b/.github/workflows/publish-nix-pgupgrade-scripts.yml
@@ -51,6 +51,9 @@ jobs:
         run: |
           VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
           VERSION=$(echo $PG_VERSION | tr -d '"')  # Remove any surrounding quotes
+          if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
+            VERSION=${{ inputs.postgresVersion }}
+          fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Create a tarball containing pg_upgrade scripts
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -688,7 +688,7 @@ default_text_search_config = 'pg_catalog.english'
 #local_preload_libraries = ''
 #session_preload_libraries = ''
 
-shared_preload_libraries = 'pg_stat_statements, pg_stat_monitor, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter'	# (change requires restart)
+shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter'	# (change requires restart)
 jit_provider = 'llvmjit'		# JIT library to use
 
 # - Other Defaults -
diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.1.94"
+postgres-version = "15.1.1.95"
diff --git a/docker/nix/build_nix.sh b/docker/nix/build_nix.sh
@@ -13,4 +13,4 @@ nix build .#psql_16/bin -o psql_16
 nix build .#psql_orioledb_16/bin -o psql_orioledb_16
 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
-nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_16
+nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_16
diff --git a/flake.nix b/flake.nix
@@ -485,6 +485,13 @@
               --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'
             chmod +x $out/bin/start-postgres-replica
           '';
+          pg-restore =
+            pkgs.runCommand "run-pg-restore" { } ''
+              mkdir -p $out/bin
+              substitute ${./nix/tools/run-restore.sh.in} $out/bin/pg-restore \
+                --subst-var-by PSQL15_BINDIR '${basePackages.psql_15.bin}'
+              chmod +x $out/bin/pg-restore
+            '';
           sync-exts-versions = pkgs.runCommand "sync-exts-versions" { } ''
             mkdir -p $out/bin
             substitute ${./nix/tools/sync-exts-versions.sh.in} $out/bin/sync-exts-versions \
@@ -615,6 +622,7 @@
             start-replica = mkApp "start-replica" "start-postgres-replica";
             migration-test = mkApp "migrate-tool" "migrate-postgres";
             sync-exts-versions = mkApp "sync-exts-versions" "sync-exts-versions";
+            pg-restore = mkApp "pg-restore" "pg-restore";
           };
 
         # 'devShells.default' lists the set of packages that are included in the
diff --git a/migrations/Dockerfile.dbmate b/migrations/Dockerfile.dbmate
@@ -20,4 +20,4 @@ ENV PATH="/usr/lib/postgresql/%VERSION%/bin:${PATH}"
 
 RUN dbmate --version
 
-ENTRYPOINT ["dbmate"]
+ENTRYPOINT ["dbmate"]
diff --git a/migrations/db/migrations/20221207154255_create_pgsodium_and_vault.sql b/migrations/db/migrations/20221207154255_create_pgsodium_and_vault.sql
@@ -9,6 +9,7 @@ BEGIN
     select count(*) = 1 
     from pg_available_extensions 
     where name = 'pgsodium'
+    and default_version in ('3.1.6', '3.1.7', '3.1.8', '3.1.9')
   );
   
   vault_exists = (
diff --git a/nix/ext/pg_net.nix b/nix/ext/pg_net.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_net";
-  version = "0.10.0";
+  version = "0.11.0";
 
   buildInputs = [ curl postgresql ];
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-R9Mzw5gvV7b2R59LTOzuOc0AI99+3ncFNzijI4mySUg=";
+    hash = "sha256-XN441jXK1q+I/LZRNwvzbSsebXHgZ8iYsslZvcPFlAs=";
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
diff --git a/nix/tests/postgresql.conf.in b/nix/tests/postgresql.conf.in
@@ -718,7 +718,7 @@ default_text_search_config = 'pg_catalog.english'
 
 #local_preload_libraries = ''
 #session_preload_libraries = ''
-shared_preload_libraries = 'pg_stat_statements, pg_stat_monitor, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace'	# (change requires restart)
+shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace'	# (change requires restart)
 jit_provider = 'llvmjit'		# JIT library to use
 
 
diff --git a/nix/tools/run-client.sh.in b/nix/tools/run-client.sh.in
@@ -7,6 +7,7 @@
 PSQL_VERSION="15"
 MIGRATION_FILE=""
 PORTNO="@PGSQL_DEFAULT_PORT@"
+PSQL_USER="postgres"
 
 # Function to display help
 print_help() {
@@ -15,6 +16,7 @@ print_help() {
     echo "Options:"
     echo "  -v, --version [15|16|orioledb-16]  Specify the PostgreSQL version to use (required)"
     echo "  -f, --file FILE                    Provide a custom migration script"
+    echo "  -u, --user USER                    Specify the user/role to use (default: postgres)"
     echo "  -h, --help                         Show this help message"
     echo
     echo "Description:"
@@ -29,6 +31,7 @@ print_help() {
     echo "  nix run .#start-client -- --version 15"
     echo "  nix run .#start-client -- --version 16 --file custom_migration.sql"
     echo "  nix run .#start-client -- --version 16 --port 5433"
+    echo "  nix run .#start-client -- --version 16 --user supabase_admin"
 }
 
 # Parse arguments
@@ -52,6 +55,15 @@ while [[ "$#" -gt 0 ]]; do
                 exit 1
             fi
             ;;
+        -u|--user)
+            if [[ -n "$2" && ! "$2" =~ ^- ]]; then
+                PSQL_USER="$2"
+                shift 2
+            else
+                echo "Error: --user requires an argument"
+                exit 1
+            fi
+            ;;
         -h|--help)
             print_help
             exit 0
@@ -137,4 +149,4 @@ fi
 # psql -v ON_ERROR_STOP=1 --no-password --no-psqlrc -U supabase_admin -p "$PORTNO" -h localhost -c 'SELECT extensions.pg_stat_statements_reset(); SELECT pg_stat_reset();' postgres || true
 
 # Start interactive psql session
-exec psql -U postgres -p "$PORTNO" -h localhost postgres
+exec psql -U "$PSQL_USER" -p "$PORTNO" -h localhost postgres
diff --git a/nix/tools/run-restore.sh.in b/nix/tools/run-restore.sh.in
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+
+set -euo pipefail
+
+# Function to display help message
+show_help() {
+    echo "Usage: nix run .#pg-restore -- [OPTIONS]"
+    echo
+    echo "Run pg_restore with the specified parameters."
+    echo
+    echo "Options:"
+    echo "  --version     PostgreSQL version (currently only 15 is supported)"
+    echo "  --dbname      Name of the database to restore to"
+    echo "  --host        Host of the database server"
+    echo "  --user        Database user to connect as"
+    echo "  --file        Path to the file to restore from (absolute or relative to current directory)"
+    echo "  --port        Port number (default: 5432)"
+    echo "  -h, --help    Show this help message and exit"
+    echo "Example:"
+    echo "nix run .#pg-restore --  --version 15 --dbname postgres --host localhost --user postgres --port 5435 --file my.dump"
+}
+
+# Initialize variables
+PG_VERSION=""
+DBNAME=""
+DBHOST=""
+DBUSER=""
+RESTORE_FILE=""
+PORT="5432"
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --version)
+            PG_VERSION="$2"
+            shift 2
+            ;;
+        --dbname)
+            DBNAME="$2"
+            shift 2
+            ;;
+        --host)
+            DBHOST="$2"
+            shift 2
+            ;;
+        --user)
+            DBUSER="$2"
+            shift 2
+            ;;
+        --file)
+            RESTORE_FILE="$2"
+            shift 2
+            ;;
+        --port)
+            PORT="$2"
+            shift 2
+            ;;
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $1"
+            show_help
+            exit 1
+            ;;
+    esac
+done
+
+# Check if all required arguments are provided
+if [ -z "$PG_VERSION" ] || [ -z "$DBNAME" ] || [ -z "$DBHOST" ] || [ -z "$DBUSER" ] || [ -z "$RESTORE_FILE" ]; then
+    echo "Error: Missing required arguments."
+    show_help
+    exit 1
+fi
+
+if [ "$PG_VERSION" == "15" ]; then
+    echo "Starting restore for PSQL 15"
+    PSQL15=@PSQL15_BINDIR@
+    PSQL_BINDIR="$PSQL15"
+else
+    echo "Error: Please provide a valid Postgres version (currently only 15 is supported)"
+    show_help
+    exit 1
+fi
+
+# Convert RESTORE_FILE to an absolute path if it's relative
+if [[ "$RESTORE_FILE" != /* ]]; then
+    RESTORE_FILE="$(pwd)/$RESTORE_FILE"
+fi
+
+# Check if the file exists
+if [ ! -f "$RESTORE_FILE" ]; then
+    echo "Error: Restore file '$RESTORE_FILE' does not exist."
+    exit 1
+fi
+
+echo "Using restore file: $RESTORE_FILE"
+
+# Run pg_restore and capture its exit status
+"$PSQL_BINDIR/bin/pg_restore" \
+    -h "$DBHOST" \
+    -p "$PORT" \
+    -U "$DBUSER" \
+    -d "$DBNAME" \
+    -v \
+    --no-owner \
+    --no-acl \
+    "$RESTORE_FILE"
+
+RESTORE_STATUS=$?
+
+# Check the exit status of pg_restore
+if [ $RESTORE_STATUS -eq 0 ]; then
+    echo "Restore completed successfully."
+    exit 0
+else
+    echo "Restore failed with exit code $RESTORE_STATUS."
+    exit $RESTORE_STATUS
+fi

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-postgres-version = "15.1.1.94"`
	`1`	`+postgres-version = "15.1.1.95"`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ ENV PATH="/usr/lib/postgresql/%VERSION%/bin:${PATH}"`
`20`	`20`
`21`	`21`	`RUN dbmate --version`
`22`	`22`
`23`		`-ENTRYPOINT ["dbmate"]`
	`23`	`+ENTRYPOINT ["dbmate"]`