Skip to content

Commit da18a61

Browse files
author
Chris Stockton
committed
Merge branch 'develop' into cs/feat-config-reloads
2 parents 44ba607 + f7bb3fe commit da18a61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1112
-268
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ jobs:
7272
id: process_release_version
7373
run: |
7474
VERSION=$(grep 'postgres-version' common-nix.vars.pkr.hcl | sed -e 's/postgres-version = "\(.*\)"/\1/g')
75+
if [[ "${{ inputs.postgresVersion }}" != "" ]]; then
76+
VERSION=${{ inputs.postgresVersion }}
77+
fi
7578
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
7679
7780
- name: Create a tarball containing pg_upgrade scripts

‎.github/workflows/testinfra-nix.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
- name: Cleanup resources on build cancellation
6666
if: ${{ cancelled() }}
6767
run: |
68-
aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --region ap-southeast-1 --instance-ids {}
69-
70-
- name: Cleanup resources on build cancellation
68+
aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids
69+
70+
- name: Cleanup resources after build
7171
if: ${{ always() }}
7272
run: |
73-
aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --region ap-southeast-1 --instance-ids {} || true
73+
aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids || true
7474
7575
- name: Cleanup AMIs
7676
if: always()

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Aside from having [ufw](https://help.ubuntu.com/community/UFW),[fail2ban](https:
5151
| Goodie | Version | Description |
5252
| ------------- | :-------------: | ------------- |
5353
| [PgBouncer](https://www.pgbouncer.org/) | [1.16.1](http://www.pgbouncer.org/changelog.html#pgbouncer-116x) | Set up Connection Pooling. |
54-
| [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. |
54+
| [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. |
5555
| [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. |
5656

5757
## Install

‎ansible/files/admin_api_scripts/pg_upgrade_scripts/common.sh

+11-3
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ begin
356356
end
357357
, case when rec.grantee = 'postgres'::regrole then 'supabase_admin'
358358
when rec.grantee = 'supabase_admin'::regrole then 'postgres'
359-
else rec.grantee::regrole
359+
when rec.grantee = 0 then 'public'
360+
else rec.grantee::regrole::text
360361
end
361362
));
362363
end if;
@@ -382,7 +383,7 @@ begin
382383
when obj->>'objtype' = 'T' then 'types'
383384
when obj->>'objtype' = 'n' then 'schemas'
384385
end
385-
, rec.grantee::regrole
386+
, case when rec.grantee = 0 then 'public' else rec.grantee::regrole::text end
386387
, case when rec.is_grantable then 'with grant option' else '' end
387388
));
388389
end if;
@@ -529,7 +530,14 @@ $$;
529530
alter database postgres connection limit -1;
530531
531532
-- #incident-2024-09-12-project-upgrades-are-temporarily-disabled
532-
grant pg_read_all_data, pg_signal_backend to postgres;
533+
do $$
534+
begin
535+
if exists (select from pg_authid where rolname = 'pg_read_all_data') then
536+
execute('grant pg_read_all_data to postgres');
537+
end if;
538+
end
539+
$$;
540+
grant pg_signal_backend to postgres;
533541
534542
set session authorization supabase_admin;
535543
drop role supabase_tmp;

‎ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

+9-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# them depending on regtypes referencing system OIDs or outdated library files.
1212
EXTENSIONS_TO_DISABLE=(
1313
"pg_graphql"
14+
"pg_stat_monitor"
1415
)
1516

1617
PG14_EXTENSIONS_TO_DISABLE=(
@@ -119,20 +120,22 @@ cleanup() {
119120
CI_start_postgres
120121
fi
121122

123+
retry 8 pg_isready -h localhost -U supabase_admin
124+
122125
echo "Re-enabling extensions"
123126
if [ -f $POST_UPGRADE_EXTENSION_SCRIPT ]; then
124-
run_sql -f $POST_UPGRADE_EXTENSION_SCRIPT
127+
retry 5 run_sql -f $POST_UPGRADE_EXTENSION_SCRIPT
125128
fi
126129

127130
echo "Removing SUPERUSER grant from postgres"
128-
run_sql -c "ALTER USER postgres WITH NOSUPERUSER;"
131+
retry 5 run_sql -c "ALTER USER postgres WITH NOSUPERUSER;"
129132

130133
echo "Resetting postgres database connection limit"
131-
run_sql -c "ALTER DATABASE postgres CONNECTION LIMIT -1;"
134+
retry 5 run_sql -c "ALTER DATABASE postgres CONNECTION LIMIT -1;"
132135

133136
if [ -z "$IS_CI" ] && [ -z "$IS_LOCAL_UPGRADE" ]; then
134137
echo "Unmounting data disk from ${MOUNT_POINT}"
135-
umount $MOUNT_POINT
138+
retry 3 umount $MOUNT_POINT
136139
fi
137140
echo "$UPGRADE_STATUS" > /tmp/pg-upgrade-status
138141

@@ -208,7 +211,7 @@ function patch_wrappers {
208211
WRAPPERS_LIB_PATH_DIR=$(dirname "$WRAPPERS_LIB_PATH")
209212
if [ "$WRAPPERS_LIB_PATH" != "$WRAPPERS_LIB_PATH_DIR/${OLD_LIB_FILE_NAME}" ]; then
210213
echo "Copying $WRAPPERS_LIB_PATH to $WRAPPERS_LIB_PATH_DIR/${OLD_LIB_FILE_NAME}"
211-
cp "$WRAPPERS_LIB_PATH" "$WRAPPERS_LIB_PATH_DIR/${OLD_LIB_FILE_NAME}"
214+
cp "$WRAPPERS_LIB_PATH" "$WRAPPERS_LIB_PATH_DIR/${OLD_LIB_FILE_NAME}" || true
212215
fi
213216
fi
214217
done
@@ -222,7 +225,7 @@ function patch_wrappers {
222225
LIB_FILE_NAME=$(basename "$OLD_WRAPPER_LIB_PATH")
223226
if [ "$WRAPPERS_LIB_PATH" != "$PGLIBNEW/${LIB_FILE_NAME}" ]; then
224227
echo "Copying $WRAPPERS_LIB_PATH to $PGLIBNEW/${LIB_FILE_NAME}"
225-
cp "$WRAPPERS_LIB_PATH" "$PGLIBNEW/${LIB_FILE_NAME}"
228+
cp "$WRAPPERS_LIB_PATH" "$PGLIBNEW/${LIB_FILE_NAME}" || true
226229
fi
227230
fi
228231
fi

‎ansible/files/adminapi.sudoers.conf

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Cmnd_Alias PGBOUNCER = /bin/systemctl start pgbouncer.service, /bin/systemctl st
1717
%adminapi ALL= NOPASSWD: /usr/bin/systemctl restart postgresql.service
1818
%adminapi ALL= NOPASSWD: /usr/bin/systemctl show -p NRestarts postgresql.service
1919
%adminapi ALL= NOPASSWD: /usr/bin/systemctl restart adminapi.service
20+
%adminapi ALL= NOPASSWD: /usr/bin/systemctl is-active commence-backup.service
21+
%adminapi ALL= NOPASSWD: /usr/bin/systemctl start commence-backup.service
2022
%adminapi ALL= NOPASSWD: /bin/systemctl daemon-reload
2123
%adminapi ALL= NOPASSWD: /bin/systemctl restart services.slice
2224
%adminapi ALL= NOPASSWD: /usr/sbin/nft -f /etc/nftables/supabase_managed.conf

‎ansible/files/commence-backup.service.j2

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[Unit]
2+
Description=Async commence physical backup
3+
4+
[Service]
5+
Type=simple
6+
User=adminapi
7+
ExecStart=/usr/bin/admin-mgr commence-backup --run-as-service true
8+
Restart=no
9+
OOMScoreAdjust=-1000
10+
11+
[Install]
12+
WantedBy=multi-user.target

‎ansible/files/envoy_config/lds.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,10 @@ resources:
254254
type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBACPerRoute
255255
- match:
256256
safe_regex:
257+
google_re2:
258+
max_program_size: 150
257259
regex: >-
258-
/auth/v1/(verify|callback|authorize|sso/saml/(acs|metadata|slo))
260+
/auth/v1/(verify|callback|authorize|sso/saml/(acs|metadata|slo)|\.well-known/(openid-configuration|jwks\.json))
259261
route:
260262
cluster: gotrue
261263
regex_rewrite:

‎ansible/files/postgresql_config/supautils.conf.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ supautils.policy_grants = '{"postgres":["auth.audit_log_entries","auth.identitie
33
# full list: address_standardizer, address_standardizer_data_us, adminpack, amcheck, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, file_fdw, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intagg, intarray, isn, lo, ltree, moddatetime, old_snapshot, orioledb, pageinspect, pg_buffercache, pg_cron, pg_freespacemap, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_repack, pg_stat_monitor, pg_stat_statements, pg_surgery, pg_tle, pg_trgm, pg_visibility, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgstattuple, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers, xml2
44
# omitted because may be unsafe: adminpack, amcheck, file_fdw, lo, old_snapshot, pageinspect, pg_buffercache, pg_freespacemap, pg_surgery, pg_visibility
55
# omitted because deprecated: intagg, xml2
6-
supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intarray, isn, ltree, moddatetime, orioledb, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pg_prewarm, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgstattuple, pgsodium, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers'
6+
supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intarray, isn, ltree, moddatetime, orioledb, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_partman, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pg_prewarm, pgmq, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgstattuple, pgsodium, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers'
77
supautils.privileged_extensions_custom_scripts_path = '/etc/postgresql-custom/extension-custom-scripts'
88
supautils.privileged_extensions_superuser = 'supabase_admin'
99
supautils.privileged_role = 'postgres'

‎ansible/tasks/internal/admin-api.yml

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@
7979
src: files/adminapi.service.j2
8080
dest: /etc/systemd/system/adminapi.service
8181

82+
- name: adminapi - create service file for commence backup process
83+
template:
84+
src: files/commence-backup.service.j2
85+
dest: /etc/systemd/system/commence-backup.service
86+
8287
- name: UFW - Allow connections to adminapi ports
8388
ufw:
8489
rule: allow

‎ansible/vars.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ postgrest_release: "12.2.3"
1717
postgrest_arm_release_checksum: sha1:fbfd6613d711ce1afa25c42d5df8f1b017f396f9
1818
postgrest_x86_release_checksum: sha1:61c513f91a8931be4062587b9d4a18b42acf5c05
1919

20-
gotrue_release: 2.160.0
21-
gotrue_release_checksum: sha1:391b3f174e3d82cc806b2ba8d65253b7b2c874a6
20+
gotrue_release: 2.162.0
21+
gotrue_release_checksum: sha1:855b23bd002577290c7d42d7042ac0f5316984b1
2222

2323
aws_cli_release: "2.2.7"
2424

@@ -50,8 +50,8 @@ postgres_exporter_release_checksum:
5050
arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
5151
amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
5252

53-
adminapi_release: 0.68.0
54-
adminmgr_release: 0.22.1
53+
adminapi_release: 0.71.1
54+
adminmgr_release: 0.24.0
5555

5656
# Postgres Extensions
5757
postgis_release: "3.3.2"

‎common-nix.vars.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.6.1.123"
1+
postgres-version = "15.8.1.003"

‎common.vars.pkr.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.1.93"
1+
postgres-version = "15.1.1.94"

‎docker/all-in-one/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function setup_postgres {
101101
mv /etc/postgresql.schema.sql /docker-entrypoint-initdb.d/migrations/99-schema.sql
102102

103103
tar -xzvf "$INIT_PAYLOAD_PATH" -C / ./etc/postgresql-custom/pgsodium_root.key
104-
echo "include = '/etc/postgresql-custom/postgresql-platform-defaults.conf'" >>$PG_CONF
104+
sed -i "/# Automatically generated optimizations/i # Supabase Platform Defaults\ninclude = '/etc/postgresql-custom/platform-defaults.conf'\n" $PG_CONF
105105

106106
# TODO (darora): walg enablement is temporarily performed here until changes from https://github.com/supabase/postgres/pull/639 get picked up
107107
# other things will still be needed in the future (auth_delay config)

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

+7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ upstream_metrics_sources:
4242
value: {{ .ProjectRef }}
4343
- name: service_type
4444
value: gotrue
45+
- name: postgrest
46+
url: "http://localhost:3001/metrics"
47+
labels_to_attach:
48+
- name: supabase_project_ref
49+
value: {{ .ProjectRef }}
50+
- name: service_type
51+
value: postgrest
4552
monitoring:
4653
disk_usage:
4754
enabled: true

‎docker/all-in-one/etc/kong/kong.yml

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ services:
2727
routes: [{ name: auth-v1-open-saml, strip_path: true, paths: [/auth/v1/sso/saml/] }],
2828
plugins: [{ name: cors }],
2929
}
30+
- {
31+
name: auth-v1-open-well-known,
32+
url: 'http://localhost:9999/.well-known/',
33+
routes: [{ name: auth-v1-open-well-known, strip_path: true, paths: [/auth/v1/.well-known/] }],
34+
plugins: [{ name: cors }],
35+
}
3036
- {
3137
name: auth-v1,
3238
url: 'http://localhost:9999/',

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# these get imported _after_ the user specified overrides
22
row_security = on
33
wal_level = logical
4-
max_wal_senders = 10
5-
max_replication_slots = 5
64
log_connections = on
75
statement_timeout = 120000
86
jit = off

‎flake.nix

+38-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
# want to have an arbitrary order, since it might matter. being
3939
# explicit is better.
4040
(import ./nix/overlays/cargo-pgrx.nix)
41-
(import ./nix/overlays/gdal-small.nix)
4241
(import ./nix/overlays/psql_16-oriole.nix)
4342

4443
];
@@ -68,15 +67,9 @@
6867
};
6968
})
7069
(import ./nix/overlays/cargo-pgrx-0-11-3.nix)
71-
# (import ./nix/overlays/postgis.nix)
72-
#(import ./nix/overlays/gdal-small.nix)
73-
7470
];
7571
};
76-
postgresql_15 = pkgs.postgresql.postgresql_15;
77-
postgresql = pkgs.postgresql.postgresql_15;
7872
sfcgal = pkgs.callPackage ./nix/ext/sfcgal/sfcgal.nix { };
79-
pg_regress = pkgs.callPackage ./nix/ext/pg_regress.nix { inherit postgresql; };
8073
supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
8174
mecab-naist-jdic = pkgs.callPackage ./nix/ext/mecab-naist-jdic/default.nix { };
8275
# Our list of PostgreSQL extensions which come from upstream Nixpkgs.
@@ -110,6 +103,7 @@
110103
./nix/ext/pgroonga.nix
111104
./nix/ext/index_advisor.nix
112105
./nix/ext/wal2json.nix
106+
./nix/ext/pgmq.nix
113107
./nix/ext/pg_repack.nix
114108
./nix/ext/pg-safeupdate.nix
115109
./nix/ext/plpgsql-check.nix
@@ -126,6 +120,7 @@
126120
./nix/ext/pg_hashids.nix
127121
./nix/ext/pgsodium.nix
128122
./nix/ext/pg_graphql.nix
123+
./nix/ext/pg_partman.nix
129124
./nix/ext/pg_stat_monitor.nix
130125
./nix/ext/pg_jsonschema.nix
131126
./nix/ext/pgvector.nix
@@ -284,22 +279,49 @@
284279
# be used with 'nix build'. Don't use the names listed below; check the
285280
# name in 'nix flake show' in order to make sure exactly what name you
286281
# want.
287-
basePackages = {
282+
basePackages = let
283+
# Function to get the PostgreSQL version from the attribute name
284+
getVersion = name:
285+
let
286+
match = builtins.match "psql_([0-9]+)" name;
287+
in
288+
if match == null then null else builtins.head match;
289+
290+
# Define the available PostgreSQL versions
291+
postgresVersions = {
292+
psql_15 = makePostgres "15";
293+
# Uncomment the line below to enable PostgreSQL 16
294+
# psql_16 = makePostgres "16";
295+
# psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
296+
};
297+
298+
# Find the active PostgreSQL version
299+
activeVersion = getVersion (builtins.head (builtins.attrNames postgresVersions));
300+
301+
# Function to create the pg_regress package
302+
makePgRegress = version:
303+
let
304+
postgresqlPackage = pkgs."postgresql_${version}";
305+
in
306+
pkgs.callPackage ./nix/ext/pg_regress.nix {
307+
postgresql = postgresqlPackage;
308+
};
309+
postgresql_15 = getPostgresqlPackage "15";
310+
in
311+
postgresVersions //{
288312
supabase-groonga = supabase-groonga;
289313
# PostgreSQL versions.
290314
psql_15 = makePostgres "15";
291-
#psql_16 = makePostgres "16";
292315
#psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
293316
sfcgal = sfcgal;
294-
pg_regress = pg_regress;
295317
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
296-
postgresql_15 = pkgs.postgresql_15;
297-
318+
inherit postgresql_15;
319+
postgresql_15_debug = if pkgs.stdenv.isLinux then postgresql_15.debug else null;
298320
postgresql_15_src = pkgs.stdenv.mkDerivation {
299321
pname = "postgresql-15-src";
300-
version = pkgs.postgresql_15.version;
322+
version = postgresql_15.version;
301323

302-
src = pkgs.postgresql_15.src;
324+
src = postgresql_15.src;
303325

304326
nativeBuildInputs = [ pkgs.bzip2 ];
305327

@@ -319,6 +341,7 @@
319341
};
320342
mecab_naist_jdic = mecab-naist-jdic;
321343
supabase_groonga = supabase-groonga;
344+
pg_regress = makePgRegress activeVersion;
322345
# Start a version of the server.
323346
start-server =
324347
let
@@ -455,6 +478,7 @@
455478
sqlTests = ./nix/tests/smoke;
456479
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
457480
supabase-groonga = pkgs.callPackage ./nix/supabase-groonga.nix { };
481+
pg_regress = basePackages.pg_regress;
458482
in
459483
pkgs.runCommand "postgres-${pgpkg.version}-check-harness"
460484
{

‎migrations/tests/extensions/01-postgis.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ grant all privileges on all sequences in schema tiger, tiger_data to postgres wi
1919
alter default privileges in schema tiger, tiger_data grant all on tables to postgres with grant option;
2020
alter default privileges in schema tiger, tiger_data grant all on routines to postgres with grant option;
2121
alter default privileges in schema tiger, tiger_data grant all on sequences to postgres with grant option;
22-
22+
SET search_path TO extensions, public, tiger, tiger_data;
2323
-- postgres role should have access
2424
set local role postgres;
2525
select tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));

‎nix/ext/0001-build-Allow-using-V8-from-system.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ index 38879cc..6e78eeb 100644
55
@@ -20,6 +20,7 @@ OBJS = $(SRCS:.cc=.o)
66
MODULE_big = plv8-$(PLV8_VERSION)
77
EXTENSION = plv8
8-
PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql $(wildcard upgrade/*.sql)
8+
PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql
99
+USE_SYSTEM_V8 = 0
1010

1111

0 commit comments

Comments
 (0)