diff --git a/src/test/regress/expected/create_drop_database_propagation.out b/src/test/regress/expected/create_drop_database_propagation.out index 98155024c..3321dd289 100644 --- a/src/test/regress/expected/create_drop_database_propagation.out +++ b/src/test/regress/expected/create_drop_database_propagation.out @@ -19,7 +19,7 @@ CREATE DATABASE mydatabase TABLESPACE = test_tablespace ALLOW_CONNECTIONS = true IS_TEMPLATE = false; -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -27,13 +27,13 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 17344 | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace + mydatabase | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace (1 row) \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -41,13 +41,13 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 17404 | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace + mydatabase | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace (1 row) \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -55,15 +55,15 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 17404 | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace + mydatabase | 6 | f | t | 10 | C | C | | create_drop_db_test_user | create_drop_db_test_user | test_tablespace (1 row) \c - - - :master_port set citus.enable_create_database_propagation=on; drop database mydatabase; -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -71,12 +71,12 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -84,12 +84,12 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -97,7 +97,7 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace + datname | encoding | datistemplate | datallowconn | datconnlimit | datcollate | datctype | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) diff --git a/src/test/regress/expected/pg15.out b/src/test/regress/expected/pg15.out index 2f005070a..c0e510ccc 100644 --- a/src/test/regress/expected/pg15.out +++ b/src/test/regress/expected/pg15.out @@ -1524,7 +1524,7 @@ CREATE DATABASE mydatabase ALLOW_CONNECTIONS = true IS_TEMPLATE = false OID = 966345; -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1532,13 +1532,13 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 17851 | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1546,13 +1546,13 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 18201 | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1560,15 +1560,15 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 18174 | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :master_port set citus.enable_create_database_propagation=on; drop database mydatabase; -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1576,12 +1576,12 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1589,12 +1589,12 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1602,7 +1602,7 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | datdba | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- (0 rows) diff --git a/src/test/regress/sql/create_drop_database_propagation.sql b/src/test/regress/sql/create_drop_database_propagation.sql index cfcd21e67..39344c7d8 100644 --- a/src/test/regress/sql/create_drop_database_propagation.sql +++ b/src/test/regress/sql/create_drop_database_propagation.sql @@ -27,7 +27,7 @@ CREATE DATABASE mydatabase ALLOW_CONNECTIONS = true IS_TEMPLATE = false; -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -38,7 +38,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -48,7 +48,7 @@ join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -61,7 +61,7 @@ WHERE datname = 'mydatabase'; set citus.enable_create_database_propagation=on; drop database mydatabase; -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -72,7 +72,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -83,7 +83,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, +SELECT pd.datname, pd.encoding, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace diff --git a/src/test/regress/sql/pg15.sql b/src/test/regress/sql/pg15.sql index 37270771b..378726f7c 100644 --- a/src/test/regress/sql/pg15.sql +++ b/src/test/regress/sql/pg15.sql @@ -1012,7 +1012,7 @@ CREATE DATABASE mydatabase IS_TEMPLATE = false OID = 966345; -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1022,7 +1022,7 @@ join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1033,7 +1033,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1046,7 +1046,7 @@ WHERE datname = 'mydatabase'; \c - - - :master_port set citus.enable_create_database_propagation=on; drop database mydatabase; -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1057,7 +1057,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_1_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace @@ -1068,7 +1068,7 @@ WHERE datname = 'mydatabase'; \c - - - :worker_2_port -SELECT pd.datname , pd.datdba, pd.encoding, pd.datlocprovider, +SELECT pd.datname, pd.encoding, pd.datlocprovider, pd.datistemplate, pd.datallowconn, pd.datconnlimit, pd.datcollate , pd. datctype , pd.daticulocale, pd.datcollversion, pd.datacl, rolname AS database_owner, pa.rolname AS database_owner, pt.spcname AS tablespace