From d2ca0cbaf7e428f9d2c3ec1b0b7afdb636265ebe Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 25 Mar 2025 07:07:25 -0400 Subject: [PATCH 1/2] chore: remove migration file from client --- nix/tools/run-client.sh.in | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nix/tools/run-client.sh.in b/nix/tools/run-client.sh.in index ef81d58c1..5c1b78341 100644 --- a/nix/tools/run-client.sh.in +++ b/nix/tools/run-client.sh.in @@ -5,7 +5,6 @@ # Default values PSQL_VERSION="15" -MIGRATION_FILE="" PORTNO="@PGSQL_DEFAULT_PORT@" PSQL_USER="postgres" @@ -15,7 +14,6 @@ print_help() { echo 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 @@ -29,7 +27,6 @@ print_help() { echo "Examples:" echo " nix run .#start-client" 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" } @@ -46,15 +43,6 @@ while [[ "$#" -gt 0 ]]; do exit 1 fi ;; - -f|--file) - if [[ -n "$2" && ! "$2" =~ ^- ]]; then - MIGRATION_FILE="$2" - shift 2 - else - echo "Error: --file requires a filename" - exit 1 - fi - ;; -u|--user) if [[ -n "$2" && ! "$2" =~ ^- ]]; then PSQL_USER="$2" @@ -115,11 +103,5 @@ export PATH=$BINDIR/bin:$PATH export POSTGRES_DB=postgres export POSTGRES_HOST=localhost -PGSQL_SUPERUSER=@PGSQL_SUPERUSER@ -MIGRATIONS_DIR=@MIGRATIONS_DIR@ -POSTGRESQL_SCHEMA_SQL=@POSTGRESQL_SCHEMA_SQL@ -PGBOUNCER_AUTH_SCHEMA_SQL=@PGBOUNCER_AUTH_SCHEMA_SQL@ -STAT_EXTENSION_SQL=@STAT_EXTENSION_SQL@ - # Start interactive psql session exec psql -U "$PSQL_USER" -p "$PORTNO" -h localhost postgres From 7c31a9a6f408fe86a2753656e9de71fa0f2ef190 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 25 Mar 2025 07:22:46 -0400 Subject: [PATCH 2/2] chore: somehow lost var for show-commands restoring --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index b36ccda57..8ed25ef4c 100644 --- a/flake.nix +++ b/flake.nix @@ -865,6 +865,7 @@ local-infra-bootstrap = mkApp "local-infra-bootstrap" "local-infra-bootstrap"; dbmate-tool = mkApp "dbmate-tool" "dbmate-tool"; update-readme = mkApp "update-readme" "update-readme"; + show-commands = mkApp "show-commands" "show-commands"; }; # 'devShells.default' lists the set of packages that are included in the