From 3254a82af5a4dafe2c93268236534a3850500321 Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 5 Aug 2022 15:45:33 +0300 Subject: [PATCH] Explicitly cast catalog "char" column to text before concatenation Relevant PG commit: 07eee5a0dc642d26f44d65c4e6263304208e8583 --- src/test/regress/expected/pg14.out | 12 ++++++------ src/test/regress/sql/pg14.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/regress/expected/pg14.out b/src/test/regress/expected/pg14.out index fa6e42065..8d5704a6e 100644 --- a/src/test/regress/expected/pg14.out +++ b/src/test/regress/expected/pg14.out @@ -279,7 +279,7 @@ SELECT create_distributed_table('col_compression', 'a', shard_count:=4); (1 row) -SELECT attname || ' ' || attcompression AS column_compression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'col\_compression%' AND attnum > 0 ORDER BY 1; +SELECT attname || ' ' || attcompression::text AS column_compression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'col\_compression%' AND attnum > 0 ORDER BY 1; column_compression --------------------------------------------------------------------- a p @@ -287,7 +287,7 @@ SELECT attname || ' ' || attcompression AS column_compression FROM pg_attribute (2 rows) SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); column_compression --------------------------------------------------------------------- @@ -313,7 +313,7 @@ NOTICE: Moving shard xxxxx from localhost:xxxxx to localhost:xxxxx ... CALL citus_cleanup_orphaned_shards(); NOTICE: cleaned up 1 orphaned shards SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); column_compression --------------------------------------------------------------------- @@ -325,7 +325,7 @@ SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regcla ALTER TABLE col_compression ALTER COLUMN b SET COMPRESSION pglz; ALTER TABLE col_compression ALTER COLUMN a SET COMPRESSION default; SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); column_compression --------------------------------------------------------------------- @@ -336,7 +336,7 @@ SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regcla -- test propagation of ALTER TABLE .. ADD COLUMN .. COMPRESSION .. ALTER TABLE col_compression ADD COLUMN c TEXT COMPRESSION pglz; SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); column_compression --------------------------------------------------------------------- @@ -354,7 +354,7 @@ SELECT create_distributed_table('col_comp_par', 'a'); CREATE TABLE col_comp_par_1 PARTITION OF col_comp_par FOR VALUES FROM ('abc') TO ('def'); SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_comp\_par\_1\_%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_comp\_par\_1\_%' AND attnum > 0 ORDER BY 1 )$$); column_compression --------------------------------------------------------------------- diff --git a/src/test/regress/sql/pg14.sql b/src/test/regress/sql/pg14.sql index e40d52c10..2f227dca0 100644 --- a/src/test/regress/sql/pg14.sql +++ b/src/test/regress/sql/pg14.sql @@ -92,9 +92,9 @@ SET citus.shard_replication_factor TO 1; CREATE TABLE col_compression (a TEXT COMPRESSION pglz, b TEXT); SELECT create_distributed_table('col_compression', 'a', shard_count:=4); -SELECT attname || ' ' || attcompression AS column_compression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'col\_compression%' AND attnum > 0 ORDER BY 1; +SELECT attname || ' ' || attcompression::text AS column_compression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'col\_compression%' AND attnum > 0 ORDER BY 1; SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); -- test column compression propagation in rebalance @@ -103,20 +103,20 @@ SELECT citus_move_shard_placement((SELECT * FROM moving_shard), :'public_worker_ SELECT rebalance_table_shards('col_compression', rebalance_strategy := 'by_shard_count', shard_transfer_mode := 'block_writes'); CALL citus_cleanup_orphaned_shards(); SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); -- test propagation of ALTER TABLE .. ALTER COLUMN .. SET COMPRESSION .. ALTER TABLE col_compression ALTER COLUMN b SET COMPRESSION pglz; ALTER TABLE col_compression ALTER COLUMN a SET COMPRESSION default; SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); -- test propagation of ALTER TABLE .. ADD COLUMN .. COMPRESSION .. ALTER TABLE col_compression ADD COLUMN c TEXT COMPRESSION pglz; SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_compression%' AND attnum > 0 ORDER BY 1 )$$); -- test attaching to a partitioned table with column compression @@ -126,7 +126,7 @@ SELECT create_distributed_table('col_comp_par', 'a'); CREATE TABLE col_comp_par_1 PARTITION OF col_comp_par FOR VALUES FROM ('abc') TO ('def'); SELECT result AS column_compression FROM run_command_on_workers($$SELECT ARRAY( -SELECT attname || ' ' || attcompression FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_comp\_par\_1\_%' AND attnum > 0 ORDER BY 1 +SELECT attname || ' ' || attcompression::text FROM pg_attribute WHERE attrelid::regclass::text LIKE 'pg14.col\_comp\_par\_1\_%' AND attnum > 0 ORDER BY 1 )$$); RESET citus.multi_shard_modify_mode;