external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use datlocale in check_database_on_all_nodes function for PG17 

This commit also has to do with renaming of
daticulocale to datlocale

Relevant PG commit:
f696c0cd5f299f1b51e214efc55a22a782cc175d
f696c0cd5f

Keeping this commit separate from the previous one because
these changes will be different once we drop PG15 support.

For now I renamed pg_ge_15_options to pg_ge_15_17_options
and together with it I changed the meaning of the variable.

However when we drop PG14 support, we will use pg_ge_17_options
and delete pg_ge_15_options altogether
pull/7922/head
naisila 2024-07-30 17:59:24 +02:00
parent caceb35eba
commit be75c0ec4c
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/regress/expected/multi_test_helpers.out
View File

@ -565,13 +565,15 @@ CREATE OR REPLACE FUNCTION check_database_on_all_nodes(p_database_name text)
RETURNS TABLE (node_type text, result text) RETURNS TABLE (node_type text, result text)
AS $func$ AS $func$
DECLARE DECLARE
pg_ge_15_options text := ''; pg_ge_15_17_options text := '';
pg_ge_16_options text := ''; pg_ge_16_options text := '';
BEGIN BEGIN
IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'datlocprovider') THEN IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticulocale') THEN
pg_ge_15_options := ', daticulocale, datcollversion, datlocprovider'; pg_ge_15_17_options := ', daticulocale, datcollversion, datlocprovider';
ELSIF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'datlocale') THEN
pg_ge_15_17_options := ', datlocale as daticulocale, datcollversion, datlocprovider';
ELSE ELSE
pg_ge_15_options := $$, null as daticulocale, null as datcollversion, 'c' as datlocprovider$$; pg_ge_15_17_options := $$, null as daticulocale, null as datcollversion, 'c' as datlocprovider$$;
END IF; END IF;
IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticurules') THEN IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticurules') THEN
@ -601,7 +603,7 @@ BEGIN
pg_encoding_to_char(pd.encoding) as encoding, pg_encoding_to_char(pd.encoding) as encoding,
datistemplate, datallowconn, datconnlimit, datacl, datistemplate, datallowconn, datconnlimit, datacl,
pt.spcname AS tablespace, datcollate, datctype pt.spcname AS tablespace, datcollate, datctype
%2$s -- >= pg15 options %2$s -- >= pg15 & pg17 options
%3$s -- >= pg16 options %3$s -- >= pg16 options
FROM pg_database pd FROM pg_database pd
JOIN pg_authid pa ON pd.datdba = pa.oid JOIN pg_authid pa ON pd.datdba = pa.oid
@ -620,7 +622,7 @@ BEGIN
) AS stale_pg_dist_object_record_for_a_db_exists ) AS stale_pg_dist_object_record_for_a_db_exists
) q ) q
$$, $$,
p_database_name, pg_ge_15_options, pg_ge_16_options p_database_name, pg_ge_15_17_options, pg_ge_16_options
) )
) q2 ) q2
JOIN pg_dist_node USING (nodeid); JOIN pg_dist_node USING (nodeid);

14
src/test/regress/sql/multi_test_helpers.sql
View File

@ -591,13 +591,15 @@ CREATE OR REPLACE FUNCTION check_database_on_all_nodes(p_database_name text)
RETURNS TABLE (node_type text, result text) RETURNS TABLE (node_type text, result text)
AS $func$ AS $func$
DECLARE DECLARE
pg_ge_15_options text := ''; pg_ge_15_17_options text := '';
pg_ge_16_options text := ''; pg_ge_16_options text := '';
BEGIN BEGIN
IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'datlocprovider') THEN IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticulocale') THEN
pg_ge_15_options := ', daticulocale, datcollversion, datlocprovider'; pg_ge_15_17_options := ', daticulocale, datcollversion, datlocprovider';
ELSIF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'datlocale') THEN
pg_ge_15_17_options := ', datlocale as daticulocale, datcollversion, datlocprovider';
ELSE ELSE
pg_ge_15_options := $$, null as daticulocale, null as datcollversion, 'c' as datlocprovider$$; pg_ge_15_17_options := $$, null as daticulocale, null as datcollversion, 'c' as datlocprovider$$;
END IF; END IF;
IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticurules') THEN IF EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = 'pg_database'::regclass AND attname = 'daticurules') THEN
@ -627,7 +629,7 @@ BEGIN
pg_encoding_to_char(pd.encoding) as encoding, pg_encoding_to_char(pd.encoding) as encoding,
datistemplate, datallowconn, datconnlimit, datacl, datistemplate, datallowconn, datconnlimit, datacl,
pt.spcname AS tablespace, datcollate, datctype pt.spcname AS tablespace, datcollate, datctype
%2$s -- >= pg15 options %2$s -- >= pg15 & pg17 options
%3$s -- >= pg16 options %3$s -- >= pg16 options
FROM pg_database pd FROM pg_database pd
JOIN pg_authid pa ON pd.datdba = pa.oid JOIN pg_authid pa ON pd.datdba = pa.oid
@ -646,7 +648,7 @@ BEGIN
) AS stale_pg_dist_object_record_for_a_db_exists ) AS stale_pg_dist_object_record_for_a_db_exists
) q ) q
$$, $$,
p_database_name, pg_ge_15_options, pg_ge_16_options p_database_name, pg_ge_15_17_options, pg_ge_16_options
) )
) q2 ) q2
JOIN pg_dist_node USING (nodeid); JOIN pg_dist_node USING (nodeid);