fix: refactor tests to work with include_dir approach

and be more accurate with production conditions

Author: samrose

ansible/tasks/setup-postgres.yml

@@ -116,6 +116,7 @@
   with_items:
     - '/etc/postgresql'
     - '/etc/postgresql-custom'
+    - '/etc/postgresql-custom/conf.d'
   when: debpkg_mode or nixpkg_mode
 
 - name: create placeholder config files

ansible/tasks/setup-wal-g.yml

@@ -62,7 +62,7 @@
 
 - name: Move custom wal-g.conf file to /etc/postgresql-custom/conf.d/wal-g.conf
   copy:
-    src: "files/postgresql_config/conf.d/walg.conf"
+    src: "files/postgresql_config/conf.d/wal-g.conf"
     dest: /etc/postgresql-custom/conf.d/wal-g.conf
     mode: 0664
     owner: postgres

migrations/tests/extensions/01-postgis.sql

@@ -2,6 +2,10 @@ begin;
 do $_$
 begin
   if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    -- create address_standardizer and dependencies first to ensure correct schema placement
+    create extension if not exists address_standardizer with schema extensions;
+    create extension if not exists address_standardizer_data_us with schema extensions;
+
     -- create postgis tiger as supabase_admin
     create extension if not exists postgis_tiger_geocoder cascade;
 

nix/checks.nix

@@ -295,7 +295,7 @@
                     fi
                 done
 
-                if ! psql -p ${pgPort} -h ${self.supabase.defaults.host} --no-password --username=supabase_admin -d postgres -v ON_ERROR_STOP=1 -Xf ${./tests/prime.sql}; then
+                if ! psql -p ${pgPort} -h ${self.supabase.defaults.host} --no-password --username=supabase_admin -d postgres -v ON_ERROR_STOP=1 -Xf ${./tests/prime-production.sql}; then
                   echo "Error executing SQL file"
                   exit 1
                 fi

nix/packages/lib.nix

@@ -64,13 +64,19 @@
         else
           "${pkgs.glibcLocales}/lib/locale/locale-archive";
 
+      postgresqlConfigBaseDir = builtins.path {
+        name = "postgresql_config";
+        path = ../../ansible/files/postgresql_config;
+      };
+
       substitutions = {
         SHELL_PATH = "${pkgs.bash}/bin/bash";
         PGSQL_DEFAULT_PORT = "${defaults.port}";
         PGSQL_SUPERUSER = "${defaults.superuser}";
         PSQL15_BINDIR = "${psql_15}";
         PSQL17_BINDIR = "${psql_17}";
         PSQL_CONF_FILE = "${paths.pgconfigFile}";
+        POSTGRESQL_CONFIG_DIR = "${postgresqlConfigBaseDir}";
         PSQLORIOLEDB17_BINDIR = "${psql_orioledb-17}";
         PGSODIUM_GETKEY = "${paths.getkeyScript}";
         PG_HBA = "${paths.pgHbaConfigFile}";
@@ -96,17 +102,7 @@
           ;
       }
       ''
-        mkdir -p $out/bin $out/etc/postgresql-custom $out/etc/postgresql $out/extension-custom-scripts
-
-        # Copy config files with error handling
-        cp -r ${paths.configConfDir} $out/etc/postgresql-custom/|| { echo "Failed to copy conf.d"; exit 1; }
-        cp ${paths.pgconfigFile} $out/etc/postgresql/postgresql.conf || { echo "Failed to copy postgresql.conf"; exit 1; }
-        cp ${paths.pgHbaConfigFile} $out/etc/postgresql/pg_hba.conf || { echo "Failed to copy pg_hba.conf"; exit 1; }
-        cp ${paths.pgIdentConfigFile} $out/etc/postgresql/pg_ident.conf || { echo "Failed to copy pg_ident.conf"; exit 1; }
-        cp -r ${paths.postgresqlExtensionCustomScriptsPath}/* $out/extension-custom-scripts/ || { echo "Failed to copy custom scripts"; exit 1; }
-
-        echo "Copy operation completed"
-        chmod 644 $out/etc/postgresql-custom/conf.d/supautils.conf $out/etc/postgresql/postgresql.conf $out/etc/postgresql-custom/conf.d/logging.conf $out/etc/postgresql/pg_hba.conf
+        mkdir -p $out/bin
 
         substitute ${../tools/run-server.sh.in} $out/bin/start-postgres-server \
           ${

nix/tests/expected/evtrigs.out

@@ -1,3 +1,5 @@
+BEGIN;
+set client_min_messages = warning;
 select
   e.evtname,
   e.evtowner::regrole as evtowner,
@@ -10,19 +12,19 @@ join pg_proc p
 join pg_namespace n_func
   on p.pronamespace = n_func.oid
 where p.prorettype = 'event_trigger'::regtype;
-                evtname                 |    evtowner    | evtfunction_schema |            evtfunction             | function_owner 
-----------------------------------------+----------------+--------------------+------------------------------------+----------------
- issue_pg_graphql_access                | supabase_admin | extensions         | grant_pg_graphql_access            | supabase_admin
- issue_graphql_placeholder              | supabase_admin | extensions         | set_graphql_placeholder            | supabase_admin
- pgrst_ddl_watch                        | supabase_admin | extensions         | pgrst_ddl_watch                    | supabase_admin
- pgrst_drop_watch                       | supabase_admin | extensions         | pgrst_drop_watch                   | supabase_admin
- graphql_watch_ddl                      | supabase_admin | graphql            | graphql.increment_schema_version   | supabase_admin
- graphql_watch_drop                     | supabase_admin | graphql            | graphql.increment_schema_version   | supabase_admin
- issue_pg_cron_access                   | supabase_admin | extensions         | grant_pg_cron_access               | supabase_admin
- issue_pg_net_access                    | supabase_admin | extensions         | grant_pg_net_access                | supabase_admin
- pg_tle_event_trigger_for_drop_function | supabase_admin | pgtle              | pgtle.pg_tle_feature_info_sql_drop | supabase_admin
- pgaudit_ddl_command_end                | supabase_admin | public             | pgaudit_ddl_command_end            | supabase_admin
- pgaudit_sql_drop                       | supabase_admin | public             | pgaudit_sql_drop                   | supabase_admin
- pgsodium_trg_mask_update               | supabase_admin | pgsodium           | pgsodium.trg_mask_update           | supabase_admin
-(12 rows)
+          evtname          |    evtowner    | evtfunction_schema |           evtfunction            | function_owner 
+---------------------------+----------------+--------------------+----------------------------------+----------------
+ issue_pg_graphql_access   | supabase_admin | extensions         | grant_pg_graphql_access          | supabase_admin
+ issue_graphql_placeholder | supabase_admin | extensions         | set_graphql_placeholder          | supabase_admin
+ pgrst_ddl_watch           | supabase_admin | extensions         | pgrst_ddl_watch                  | supabase_admin
+ pgrst_drop_watch          | supabase_admin | extensions         | pgrst_drop_watch                 | supabase_admin
+ graphql_watch_ddl         | supabase_admin | graphql            | graphql.increment_schema_version | supabase_admin
+ graphql_watch_drop        | supabase_admin | graphql            | graphql.increment_schema_version | supabase_admin
+ issue_pg_cron_access      | supabase_admin | extensions         | grant_pg_cron_access             | supabase_admin
+ issue_pg_net_access       | supabase_admin | extensions         | grant_pg_net_access              | supabase_admin
+ pgaudit_ddl_command_end   | supabase_admin | extensions         | pgaudit_ddl_command_end          | supabase_admin
+ pgaudit_sql_drop          | supabase_admin | extensions         | pgaudit_sql_drop                 | supabase_admin
+ pgsodium_trg_mask_update  | supabase_admin | pgsodium           | pgsodium.trg_mask_update         | supabase_admin
+(11 rows)
 
+ROLLBACK;

nix/tests/expected/extensions_schema.out

@@ -1,3 +1,5 @@
+BEGIN;
+set client_min_messages = warning;
 -- all default extensions are installed in a schema "extensions"
 -- we don't include the version as that will break often, we only care about
 -- ensuring these extensions are present
@@ -15,8 +17,13 @@ order by
     e.extname;
    extension_name   | schema_name | extension_owner 
 --------------------+-------------+-----------------
+ dblink             | extensions  | supabase_admin
+ pg_repack          | extensions  | supabase_admin
  pg_stat_statements | extensions  | supabase_admin
+ pgaudit            | extensions  | supabase_admin
  pgcrypto           | extensions  | supabase_admin
+ postgis            | extensions  | supabase_admin
  uuid-ossp          | extensions  | supabase_admin
-(3 rows)
+(7 rows)
 
+ROLLBACK;

nix/tests/expected/http.out

@@ -1,5 +1,8 @@
 -- Test for http extension
 -- Basic HTTP functionality tests
+BEGIN;
+set client_min_messages = warning;
+create extension if not exists http with schema extensions;
 -- Test basic HTTP GET request
 SELECT status FROM http_get('http://localhost:' || (SELECT value FROM test_config WHERE key = 'http_mock_port') || '/get');
  status 
@@ -103,3 +106,4 @@ SELECT status FROM http_get('http://localhost:' || (SELECT value FROM test_confi
     200
 (1 row)
 
+ROLLBACK;

nix/tests/expected/hypopg.out

@@ -1,3 +1,6 @@
+BEGIN;
+set client_min_messages = warning;
+create extension if not exists hypopg with schema extensions;
 create schema v;
 create table v.samp(
   id int
@@ -11,4 +14,4 @@ $$);
 (1 row)
 
 drop schema v cascade;
-NOTICE:  drop cascades to table v.samp
+ROLLBACK;

nix/tests/expected/index_advisor.out

@@ -1,3 +1,7 @@
+BEGIN;
+set client_min_messages = warning;
+create extension if not exists hypopg with schema extensions;
+create extension if not exists index_advisor with schema extensions;
 create schema v;
 create table v.book(
   id int primary key,
@@ -13,4 +17,4 @@ from
 (1 row)
 
 drop schema v cascade;
-NOTICE:  drop cascades to table v.book
+ROLLBACK;