Skip to content

Commit 7cbfd8e

Browse files
tglsfdctglsfdc
committed
Solve cross-version-upgrade testing problem induced by 1fb57af.
Renaming varchar_transform to varchar_support had a side effect I hadn't foreseen: the core regression tests leave around a transform object that relies on that function, so the name change breaks cross-version upgrade tests, because the name used in the older branches doesn't match. Since the dependency on varchar_transform was chosen with the aid of a dartboard anyway (it would surely not work as a language transform support function), fix by just choosing a different random builtin function with the right signature. Also add some comments explaining why this isn't horribly unsafe. I chose to make the same substitution in a couple of other copied-and-pasted test cases, for consistency, though those aren't directly contributing to the testing problem. Per buildfarm. Back-patch, else it doesn't fix the problem.
1 parent 73668c5 commit 7cbfd8e

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

‎src/bin/pg_dump/t/002_pg_dump.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3922,9 +3922,9 @@
39223922
all_runs => 1,
39233923
create_order => 34,
39243924
create_sql =>
3925-
'CREATE TRANSFORM FOR int LANGUAGE SQL (FROM SQL WITH FUNCTION varchar_transform(internal), TO SQL WITH FUNCTION int4recv(internal));',
3925+
'CREATE TRANSFORM FOR int LANGUAGE SQL (FROM SQL WITH FUNCTION prsd_lextype(internal), TO SQL WITH FUNCTION int4recv(internal));',
39263926
regexp =>
3927-
qr/CREATE TRANSFORM FOR integer LANGUAGE sql \(FROM SQL WITH FUNCTION pg_catalog\.varchar_transform\(internal\), TO SQL WITH FUNCTION pg_catalog\.int4recv\(internal\)\);/m,
3927+
qr/CREATE TRANSFORM FOR integer LANGUAGE sql \(FROM SQL WITH FUNCTION pg_catalog\.prsd_lextype\(internal\), TO SQL WITH FUNCTION pg_catalog\.int4recv\(internal\)\);/m,
39283928
like => {
39293929
binary_upgrade => 1,
39303930
clean => 1,

‎src/test/modules/test_ddl_deparse/expected/create_transform.out

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
-- The function FROM SQL should have internal as single argument as well
66
-- as return type. The function TO SQL should have as single argument
77
-- internal and as return argument the datatype of the transform done.
8-
-- pl/plpgsql does not authorize the use of internal as data type.
8+
-- We choose some random built-in functions that have the right signature.
9+
-- This won't actually be used, because the SQL function language
10+
-- doesn't implement transforms (there would be no point).
911
CREATE TRANSFORM FOR int LANGUAGE SQL (
10-
FROM SQL WITH FUNCTION varchar_transform(internal),
12+
FROM SQL WITH FUNCTION prsd_lextype(internal),
1113
TO SQL WITH FUNCTION int4recv(internal));
1214
NOTICE: DDL test: type simple, tag CREATE TRANSFORM
1315
DROP TRANSFORM FOR int LANGUAGE SQL;

‎src/test/modules/test_ddl_deparse/sql/create_transform.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
-- The function FROM SQL should have internal as single argument as well
77
-- as return type. The function TO SQL should have as single argument
88
-- internal and as return argument the datatype of the transform done.
9-
-- pl/plpgsql does not authorize the use of internal as data type.
9+
-- We choose some random built-in functions that have the right signature.
10+
-- This won't actually be used, because the SQL function language
11+
-- doesn't implement transforms (there would be no point).
1012
CREATE TRANSFORM FOR int LANGUAGE SQL (
11-
FROM SQL WITH FUNCTION varchar_transform(internal),
13+
FROM SQL WITH FUNCTION prsd_lextype(internal),
1214
TO SQL WITH FUNCTION int4recv(internal));
1315

1416
DROP TRANSFORM FOR int LANGUAGE SQL;

‎src/test/regress/expected/object_address.out

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ CREATE SERVER "integer" FOREIGN DATA WRAPPER addr_fdw;
3333
CREATE USER MAPPING FOR regress_addr_user SERVER "integer";
3434
ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user IN SCHEMA public GRANT ALL ON TABLES TO regress_addr_user;
3535
ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user REVOKE DELETE ON TABLES FROM regress_addr_user;
36+
-- this transform would be quite unsafe to leave lying around,
37+
-- except that the SQL language pays no attention to transforms:
3638
CREATE TRANSFORM FOR int LANGUAGE SQL (
37-
FROM SQL WITH FUNCTION varchar_transform(internal),
39+
FROM SQL WITH FUNCTION prsd_lextype(internal),
3840
TO SQL WITH FUNCTION int4recv(internal));
3941
CREATE PUBLICATION addr_pub FOR TABLE addr_nsp.gentable;
4042
CREATE SUBSCRIPTION addr_sub CONNECTION '' PUBLICATION bar WITH (connect = false, slot_name = NONE);

‎src/test/regress/sql/object_address.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ CREATE SERVER "integer" FOREIGN DATA WRAPPER addr_fdw;
3636
CREATE USER MAPPING FOR regress_addr_user SERVER "integer";
3737
ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user IN SCHEMA public GRANT ALL ON TABLES TO regress_addr_user;
3838
ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user REVOKE DELETE ON TABLES FROM regress_addr_user;
39+
-- this transform would be quite unsafe to leave lying around,
40+
-- except that the SQL language pays no attention to transforms:
3941
CREATE TRANSFORM FOR int LANGUAGE SQL (
40-
FROM SQL WITH FUNCTION varchar_transform(internal),
42+
FROM SQL WITH FUNCTION prsd_lextype(internal),
4143
TO SQL WITH FUNCTION int4recv(internal));
4244
CREATE PUBLICATION addr_pub FOR TABLE addr_nsp.gentable;
4345
CREATE SUBSCRIPTION addr_sub CONNECTION '' PUBLICATION bar WITH (connect = false, slot_name = NONE);

0 commit comments

Comments
 (0)