diff --git a/scripts/test_updates.sh b/scripts/test_updates.sh index 81905b4a1..5d5ea6f7a 100755 --- a/scripts/test_updates.sh +++ b/scripts/test_updates.sh @@ -11,7 +11,7 @@ TEST_VERSION=${TEST_VERSION:-} GIT_ID=$(git -C ${BASE_DIR} describe --dirty --always | sed -e "s|/|_|g") UPDATE_TO_IMAGE=${UPDATE_TO_IMAGE:-update_test} UPDATE_TO_TAG=${UPDATE_TO_TAG:-${GIT_ID}} -PG_VERSION=${PG_VERSION:-11.0} +PG_VERSION=${PG_VERSION:-12.0} # This will propagate to the test_update_from_tags.sh script export TEST_REPAIR diff --git a/sql/updates/post-update.sql b/sql/updates/post-update.sql index f24f8f040..c4394a580 100644 --- a/sql/updates/post-update.sql +++ b/sql/updates/post-update.sql @@ -46,7 +46,21 @@ INSERT INTO saved_privs WHERE tmpnsp = '_timescaledb_catalog' AND tmpname = 'chunk') FROM pg_class JOIN pg_namespace ns ON ns.oid = relnamespace LEFT JOIN saved_privs ON tmpnsp = nspname AND tmpname = relname - WHERE nspname IN ('_timescaledb_catalog', '_timescaledb_config') + WHERE relkind IN ('r', 'v') AND nspname IN ('_timescaledb_catalog', '_timescaledb_config') + OR nspname = '_timescaledb_internal' + AND relname IN ('hypertable_chunk_local_size', 'compressed_chunk_stats', + 'bgw_job_stat', 'bgw_policy_chunk_stats') +ON CONFLICT DO NOTHING; + +-- The above is good enough for tables and views. However sequences need to +-- use the "chunk_id_seq" catalog sequence as a template +INSERT INTO saved_privs + SELECT nspname, relname, relacl, + (SELECT tmpini FROM saved_privs + WHERE tmpnsp = '_timescaledb_catalog' AND tmpname = 'chunk_id_seq') + FROM pg_class JOIN pg_namespace ns ON ns.oid = relnamespace + LEFT JOIN saved_privs ON tmpnsp = nspname AND tmpname = relname + WHERE relkind IN ('S') AND nspname IN ('_timescaledb_catalog', '_timescaledb_config') OR nspname = '_timescaledb_internal' AND relname IN ('hypertable_chunk_local_size', 'compressed_chunk_stats', 'bgw_job_stat', 'bgw_policy_chunk_stats') diff --git a/test/sql/updates/setup.catalog.sql b/test/sql/updates/setup.catalog.sql index c3831f1ca..10738166c 100644 --- a/test/sql/updates/setup.catalog.sql +++ b/test/sql/updates/setup.catalog.sql @@ -21,3 +21,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA _timescaledb_catalog GRANT SELECT ON TABLES TO tsdbadmin; ALTER DEFAULT PRIVILEGES IN SCHEMA _timescaledb_config GRANT SELECT ON TABLES TO tsdbadmin; +ALTER DEFAULT PRIVILEGES IN SCHEMA _timescaledb_catalog + GRANT SELECT ON SEQUENCES TO tsdbadmin; +ALTER DEFAULT PRIVILEGES IN SCHEMA _timescaledb_config + GRANT SELECT ON SEQUENCES TO tsdbadmin;