Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98ca648

Browse files
committed
Make contrib modules' installation scripts more secure.
Hostile objects located within the installation-time search_path couldcapture references in an extension's installation or upgrade script.If the extension is being installed with superuser privileges, thisopens the door to privilege escalation. While such hazards have existedall along, their urgency increases with the v13 "trusted extensions"feature, because that lets a non-superuser control the installation pathfor a superuser-privileged script. Therefore, make a number of changesto make such situations more secure:* Tweak the construction of the installation-time search_path to ensurethat references to objects in pg_catalog can't be subverted; andexplicitly add pg_temp to the end of the path to prevent attacks usingtemporary objects.* Disable check_function_bodies within installation/upgrade scripts,so that any security gaps in SQL-language or PL-language function bodiescannot create a risk of unwanted installation-time code execution.* Adjust lookup of type input/receive functions and join estimatorfunctions to complain if there are multiple candidate functions. Thisprevents capture of references to functions whose signature is not thefirst one checked; and it's arguably more user-friendly anyway.* Modify various contrib upgrade scripts to ensure that catalogmodification queries are executed with secure search paths. (Theseare in-place modifications with no extension version changes, sinceit is the update process itself that is at issue, not the end result.)Extensions that depend on other extensions cannot be made fully secureby these methods alone; therefore, revert the "trusted" marking thatcommiteb67623 applied to earthdistance and hstore_plperl, pendingsome better solution to that set of issues.Also add documentation around these issues, to help extension authorswrite secure installation scripts.Patch by me, following an observation by Andres Freund; thanksto Noah Misch for review.Security:CVE-2020-14350
1 parent378bd1e commit98ca648

24 files changed

+575
-159
lines changed

‎contrib/btree_gist/btree_gist--1.1--1.2.sql

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,72 @@
88
-- wherein the signatures have been updated already. In that case to_regprocedure() will
99
-- return NULL and no updates will happen.
1010

11+
DO LANGUAGE plpgsql
12+
$$
13+
DECLARE
14+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
15+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
16+
BEGIN
17+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
18+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
19+
1120
UPDATEpg_catalog.pg_procSET
1221
proargtypes=pg_catalog.array_to_string(newtypes::pg_catalog.oid[],'')::pg_catalog.oidvector,
1322
pronargs=pg_catalog.array_length(newtypes,1)
1423
FROM (VALUES
15-
(NULL::pg_catalog.text,NULL::pg_catalog.regtype[]),-- establish column types
24+
(NULL::pg_catalog.text,NULL::pg_catalog.text[]),-- establish column types
1625
('gbt_oid_distance(internal,oid,int2,oid)','{internal,oid,int2,oid,internal}'),
1726
('gbt_oid_union(bytea,internal)','{internal,internal}'),
18-
('gbt_oid_same(internal,internal,internal)','{gbtreekey8,gbtreekey8,internal}'),
27+
('gbt_oid_same(internal,internal,internal)','{SCH.gbtreekey8,SCH.gbtreekey8,internal}'),
1928
('gbt_int2_distance(internal,int2,int2,oid)','{internal,int2,int2,oid,internal}'),
2029
('gbt_int2_union(bytea,internal)','{internal,internal}'),
21-
('gbt_int2_same(internal,internal,internal)','{gbtreekey4,gbtreekey4,internal}'),
30+
('gbt_int2_same(internal,internal,internal)','{SCH.gbtreekey4,SCH.gbtreekey4,internal}'),
2231
('gbt_int4_distance(internal,int4,int2,oid)','{internal,int4,int2,oid,internal}'),
2332
('gbt_int4_union(bytea,internal)','{internal,internal}'),
24-
('gbt_int4_same(internal,internal,internal)','{gbtreekey8,gbtreekey8,internal}'),
33+
('gbt_int4_same(internal,internal,internal)','{SCH.gbtreekey8,SCH.gbtreekey8,internal}'),
2534
('gbt_int8_distance(internal,int8,int2,oid)','{internal,int8,int2,oid,internal}'),
2635
('gbt_int8_union(bytea,internal)','{internal,internal}'),
27-
('gbt_int8_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
36+
('gbt_int8_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
2837
('gbt_float4_distance(internal,float4,int2,oid)','{internal,float4,int2,oid,internal}'),
2938
('gbt_float4_union(bytea,internal)','{internal,internal}'),
30-
('gbt_float4_same(internal,internal,internal)','{gbtreekey8,gbtreekey8,internal}'),
39+
('gbt_float4_same(internal,internal,internal)','{SCH.gbtreekey8,SCH.gbtreekey8,internal}'),
3140
('gbt_float8_distance(internal,float8,int2,oid)','{internal,float8,int2,oid,internal}'),
3241
('gbt_float8_union(bytea,internal)','{internal,internal}'),
33-
('gbt_float8_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
42+
('gbt_float8_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
3443
('gbt_ts_distance(internal,timestamp,int2,oid)','{internal,timestamp,int2,oid,internal}'),
3544
('gbt_tstz_distance(internal,timestamptz,int2,oid)','{internal,timestamptz,int2,oid,internal}'),
3645
('gbt_ts_union(bytea,internal)','{internal,internal}'),
37-
('gbt_ts_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
46+
('gbt_ts_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
3847
('gbt_time_distance(internal,time,int2,oid)','{internal,time,int2,oid,internal}'),
3948
('gbt_time_union(bytea,internal)','{internal,internal}'),
40-
('gbt_time_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
49+
('gbt_time_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
4150
('gbt_date_distance(internal,date,int2,oid)','{internal,date,int2,oid,internal}'),
4251
('gbt_date_union(bytea,internal)','{internal,internal}'),
43-
('gbt_date_same(internal,internal,internal)','{gbtreekey8,gbtreekey8,internal}'),
52+
('gbt_date_same(internal,internal,internal)','{SCH.gbtreekey8,SCH.gbtreekey8,internal}'),
4453
('gbt_intv_distance(internal,interval,int2,oid)','{internal,interval,int2,oid,internal}'),
4554
('gbt_intv_union(bytea,internal)','{internal,internal}'),
46-
('gbt_intv_same(internal,internal,internal)','{gbtreekey32,gbtreekey32,internal}'),
55+
('gbt_intv_same(internal,internal,internal)','{SCH.gbtreekey32,SCH.gbtreekey32,internal}'),
4756
('gbt_cash_distance(internal,money,int2,oid)','{internal,money,int2,oid,internal}'),
4857
('gbt_cash_union(bytea,internal)','{internal,internal}'),
49-
('gbt_cash_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
58+
('gbt_cash_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
5059
('gbt_macad_union(bytea,internal)','{internal,internal}'),
51-
('gbt_macad_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}'),
60+
('gbt_macad_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}'),
5261
('gbt_text_union(bytea,internal)','{internal,internal}'),
53-
('gbt_text_same(internal,internal,internal)','{gbtreekey_var,gbtreekey_var,internal}'),
62+
('gbt_text_same(internal,internal,internal)','{SCH.gbtreekey_var,SCH.gbtreekey_var,internal}'),
5463
('gbt_bytea_union(bytea,internal)','{internal,internal}'),
55-
('gbt_bytea_same(internal,internal,internal)','{gbtreekey_var,gbtreekey_var,internal}'),
64+
('gbt_bytea_same(internal,internal,internal)','{SCH.gbtreekey_var,SCH.gbtreekey_var,internal}'),
5665
('gbt_numeric_union(bytea,internal)','{internal,internal}'),
57-
('gbt_numeric_same(internal,internal,internal)','{gbtreekey_var,gbtreekey_var,internal}'),
66+
('gbt_numeric_same(internal,internal,internal)','{SCH.gbtreekey_var,SCH.gbtreekey_var,internal}'),
5867
('gbt_bit_union(bytea,internal)','{internal,internal}'),
59-
('gbt_bit_same(internal,internal,internal)','{gbtreekey_var,gbtreekey_var,internal}'),
68+
('gbt_bit_same(internal,internal,internal)','{SCH.gbtreekey_var,SCH.gbtreekey_var,internal}'),
6069
('gbt_inet_union(bytea,internal)','{internal,internal}'),
61-
('gbt_inet_same(internal,internal,internal)','{gbtreekey16,gbtreekey16,internal}')
62-
)AS update_data (oldproc, newtypes)
63-
WHEREoid=pg_catalog.to_regprocedure(oldproc);
70+
('gbt_inet_same(internal,internal,internal)','{SCH.gbtreekey16,SCH.gbtreekey16,internal}')
71+
)AS update_data (oldproc, newtypestext),
72+
LATERAL (
73+
SELECT array_agg(replace(typ,'SCH', my_schema)::regtype)as newtypesFROM unnest(newtypestext) typ
74+
) ls
75+
WHEREoid= to_regprocedure(my_schema||'.'|| replace(oldproc,'SCH', my_schema));
76+
77+
PERFORMpg_catalog.set_config('search_path', old_path, true);
78+
END
79+
$$;

‎contrib/citext/citext--1.1--1.2.sql

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,28 @@ ALTER FUNCTION replace(citext, citext, citext) PARALLEL SAFE;
4141
ALTERFUNCTION split_part(citext, citext,int) PARALLEL SAFE;
4242
ALTERFUNCTIONtranslate(citext, citext,text) PARALLEL SAFE;
4343

44+
-- We have to update aggregates the hard way for lack of ALTER support
45+
DO LANGUAGE plpgsql
46+
$$
47+
DECLARE
48+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
49+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
50+
BEGIN
51+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
52+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
53+
4454
UPDATE pg_procSET proparallel='s'
45-
WHEREoid='min(citext)'::pg_catalog.regprocedure;
55+
WHEREoid=(my_schema||'.min('|| my_schema||'.citext)')::pg_catalog.regprocedure;
4656

4757
UPDATE pg_procSET proparallel='s'
48-
WHEREoid='max(citext)'::pg_catalog.regprocedure;
58+
WHEREoid= (my_schema||'.max('|| my_schema||'.citext)')::pg_catalog.regprocedure;
59+
60+
UPDATE pg_aggregateSET aggcombinefn= (my_schema||'.citext_smaller')::regproc
61+
WHERE aggfnoid= (my_schema||'.max('|| my_schema||'.citext)')::pg_catalog.regprocedure;
4962

50-
UPDATE pg_aggregateSET aggcombinefn='citext_smaller'
51-
WHERE aggfnoid='max(citext)'::pg_catalog.regprocedure;
63+
UPDATE pg_aggregateSET aggcombinefn=(my_schema||'.citext_larger')::regproc
64+
WHERE aggfnoid=(my_schema||'.max('|| my_schema||'.citext)')::pg_catalog.regprocedure;
5265

53-
UPDATE pg_aggregateSET aggcombinefn='citext_larger'
54-
WHERE aggfnoid='max(citext)'::pg_catalog.regprocedure;
66+
PERFORMpg_catalog.set_config('search_path', old_path, true);
67+
END
68+
$$;

‎contrib/citext/citext--1.2--1.3.sql

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,19 @@
33
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
44
\echo Use"ALTER EXTENSION citext UPDATE TO '1.3'" to load this file. \quit
55

6-
UPDATE pg_aggregateSET aggcombinefn='citext_smaller'
7-
WHERE aggfnoid='min(citext)'::pg_catalog.regprocedure;
6+
-- We have to update aggregates the hard way for lack of ALTER support
7+
DO LANGUAGE plpgsql
8+
$$
9+
DECLARE
10+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
11+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
12+
BEGIN
13+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
14+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
15+
16+
UPDATE pg_aggregateSET aggcombinefn= (my_schema||'.citext_smaller')::regproc
17+
WHERE aggfnoid= (my_schema||'.min('|| my_schema||'.citext)')::pg_catalog.regprocedure;
18+
19+
PERFORMpg_catalog.set_config('search_path', old_path, true);
20+
END
21+
$$;

‎contrib/cube/cube--1.1--1.2.sql

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,31 @@
77
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
88
-- wherein the signatures have been updated already. In that case to_regprocedure() will
99
-- return NULL and no updates will happen.
10+
DO LANGUAGE plpgsql
11+
$$
12+
DECLARE
13+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
14+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
15+
BEGIN
16+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
17+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
1018

1119
UPDATEpg_catalog.pg_procSET
1220
proargtypes=pg_catalog.array_to_string(newtypes::pg_catalog.oid[],'')::pg_catalog.oidvector,
1321
pronargs=pg_catalog.array_length(newtypes,1)
1422
FROM (VALUES
15-
(NULL::pg_catalog.text,NULL::pg_catalog.regtype[]),-- establish column types
16-
('g_cube_consistent(internal,cube,int4,oid,internal)','{internal,cube,int2,oid,internal}'),
17-
('g_cube_distance(internal,cube,smallint,oid)','{internal,cube,smallint,oid,internal}')
18-
)AS update_data (oldproc, newtypes)
19-
WHEREoid=pg_catalog.to_regprocedure(oldproc);
23+
(NULL::pg_catalog.text,NULL::pg_catalog.text[]),-- establish column types
24+
('g_cube_consistent(internal,SCH.cube,int4,oid,internal)','{internal,SCH.cube,int2,oid,internal}'),
25+
('g_cube_distance(internal,SCH.cube,smallint,oid)','{internal,SCH.cube,smallint,oid,internal}')
26+
)AS update_data (oldproc, newtypestext),
27+
LATERAL (
28+
SELECT array_agg(replace(typ,'SCH', my_schema)::regtype)as newtypesFROM unnest(newtypestext) typ
29+
) ls
30+
WHEREoid= to_regprocedure(my_schema||'.'|| replace(oldproc,'SCH', my_schema));
31+
32+
PERFORMpg_catalog.set_config('search_path', old_path, true);
33+
END
34+
$$;
2035

2136
ALTERFUNCTION cube_in(cstring) PARALLEL SAFE;
2237
ALTERFUNCTION cube(float8[], float8[]) PARALLEL SAFE;

‎contrib/cube/cube--1.3--1.4.sql

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
-- bound into a particular opclass. There's no SQL command for that,
1313
-- so fake it with a manual update on pg_depend.
1414
--
15+
DO LANGUAGE plpgsql
16+
$$
17+
DECLARE
18+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
19+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
20+
BEGIN
21+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
22+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
23+
1524
UPDATEpg_catalog.pg_depend
1625
SET deptype='a'
1726
WHERE classid='pg_catalog.pg_amproc'::pg_catalog.regclass
@@ -20,14 +29,10 @@ WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
2029
FROMpg_catalog.pg_depend
2130
WHERE classid='pg_catalog.pg_amproc'::pg_catalog.regclass
2231
AND refclassid='pg_catalog.pg_proc'::pg_catalog.regclass
23-
AND (refobjid='g_cube_compress(pg_catalog.internal)'::pg_catalog.regprocedure))
32+
AND (refobjid=(my_schema||'.g_cube_compress(pg_catalog.internal)')::pg_catalog.regprocedure))
2433
AND refclassid='pg_catalog.pg_opclass'::pg_catalog.regclass
2534
AND deptype='i';
2635

27-
ALTEROPERATOR FAMILY gist_cube_ops USING gist drop function3 (cube);
28-
ALTER EXTENSION cube DROP function g_cube_compress(pg_catalog.internal);
29-
DROPFUNCTION g_cube_compress(pg_catalog.internal);
30-
3136
UPDATEpg_catalog.pg_depend
3237
SET deptype='a'
3338
WHERE classid='pg_catalog.pg_amproc'::pg_catalog.regclass
@@ -36,10 +41,18 @@ WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
3641
FROMpg_catalog.pg_depend
3742
WHERE classid='pg_catalog.pg_amproc'::pg_catalog.regclass
3843
AND refclassid='pg_catalog.pg_proc'::pg_catalog.regclass
39-
AND (refobjid='g_cube_decompress(pg_catalog.internal)'::pg_catalog.regprocedure))
44+
AND (refobjid=(my_schema||'.g_cube_decompress(pg_catalog.internal)')::pg_catalog.regprocedure))
4045
AND refclassid='pg_catalog.pg_opclass'::pg_catalog.regclass
4146
AND deptype='i';
4247

48+
PERFORMpg_catalog.set_config('search_path', old_path, true);
49+
END
50+
$$;
51+
52+
ALTEROPERATOR FAMILY gist_cube_ops USING gist drop function3 (cube);
53+
ALTER EXTENSION cube DROP function g_cube_compress(pg_catalog.internal);
54+
DROPFUNCTION g_cube_compress(pg_catalog.internal);
55+
4356
ALTEROPERATOR FAMILY gist_cube_ops USING gist drop function4 (cube);
4457
ALTER EXTENSION cube DROP function g_cube_decompress(pg_catalog.internal);
4558
DROPFUNCTION g_cube_decompress(pg_catalog.internal);

‎contrib/earthdistance/earthdistance--1.1.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CREATE DOMAIN earth AS cube
3131
CONSTRAINT not_pointcheck(cube_is_point(value))
3232
CONSTRAINT not_3dcheck(cube_dim(value)<=3)
3333
CONSTRAINT on_surfacecheck(abs(cube_distance(value,'(0)'::cube)/
34-
earth()-1)<'10e-7'::float8);
34+
earth()-'1'::float8)<'10e-7'::float8);
3535

3636
CREATEFUNCTIONsec_to_gc(float8)
3737
RETURNS float8

‎contrib/earthdistance/earthdistance.control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ comment = 'calculate great-circle distances on the surface of the Earth'
33
default_version = '1.1'
44
module_pathname = '$libdir/earthdistance'
55
relocatable = true
6-
trusted = true
76
requires = 'cube'

‎contrib/hstore/hstore--1.1--1.2.sql

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
-- dependent on the extension.
1010

1111
DO LANGUAGE plpgsql
12-
1312
$$
14-
13+
DECLARE
14+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
15+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
1516
BEGIN
17+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
18+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
1619

1720
PERFORM1
1821
FROM pg_proc p
@@ -27,6 +30,7 @@ BEGIN
2730

2831
IF NOT FOUND
2932
THEN
33+
PERFORMpg_catalog.set_config('search_path', old_path, true);
3034

3135
CREATEFUNCTIONhstore_to_json(hstore)
3236
RETURNS json
@@ -43,6 +47,7 @@ BEGIN
4347

4448
END IF;
4549

50+
PERFORMpg_catalog.set_config('search_path', old_path, true);
4651
END;
4752

4853
$$;

‎contrib/hstore/hstore--1.3--1.4.sql

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,38 @@
77
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
88
-- wherein the signatures have been updated already. In that case to_regprocedure() will
99
-- return NULL and no updates will happen.
10+
DO LANGUAGE plpgsql
11+
$$
12+
DECLARE
13+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
14+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
15+
BEGIN
16+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
17+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
1018

1119
UPDATEpg_catalog.pg_procSET
1220
proargtypes=pg_catalog.array_to_string(newtypes::pg_catalog.oid[],'')::pg_catalog.oidvector,
1321
pronargs=pg_catalog.array_length(newtypes,1)
1422
FROM (VALUES
15-
(NULL::pg_catalog.text,NULL::pg_catalog.regtype[]),-- establish column types
16-
('ghstore_same(internal,internal,internal)','{ghstore,ghstore,internal}'),
17-
('ghstore_consistent(internal,internal,int4,oid,internal)','{internal,hstore,int2,oid,internal}'),
18-
('gin_extract_hstore(internal,internal)','{hstore,internal}'),
19-
('gin_extract_hstore_query(internal,internal,int2,internal,internal)','{hstore,internal,int2,internal,internal}'),
20-
('gin_consistent_hstore(internal,int2,internal,int4,internal,internal)','{internal,int2,hstore,int4,internal,internal}')
21-
)AS update_data (oldproc, newtypes)
22-
WHEREoid=pg_catalog.to_regprocedure(oldproc);
23+
(NULL::pg_catalog.text,NULL::pg_catalog.text[]),-- establish column types
24+
('ghstore_same(internal,internal,internal)','{SCH.ghstore,SCH.ghstore,internal}'),
25+
('ghstore_consistent(internal,internal,int4,oid,internal)','{internal,SCH.hstore,int2,oid,internal}'),
26+
('gin_extract_hstore(internal,internal)','{SCH.hstore,internal}'),
27+
('gin_extract_hstore_query(internal,internal,int2,internal,internal)','{SCH.hstore,internal,int2,internal,internal}'),
28+
('gin_consistent_hstore(internal,int2,internal,int4,internal,internal)','{internal,int2,SCH.hstore,int4,internal,internal}')
29+
)AS update_data (oldproc, newtypestext),
30+
LATERAL (
31+
SELECT array_agg(replace(typ,'SCH', my_schema)::regtype)as newtypesFROM unnest(newtypestext) typ
32+
) ls
33+
WHEREoid= to_regprocedure(my_schema||'.'|| replace(oldproc,'SCH', my_schema));
2334

2435
UPDATEpg_catalog.pg_procSET
25-
prorettype='ghstore'::pg_catalog.regtype
26-
WHEREoid=pg_catalog.to_regprocedure('ghstore_union(internal,internal)');
36+
prorettype= (my_schema||'.ghstore')::pg_catalog.regtype
37+
WHEREoid=pg_catalog.to_regprocedure((my_schema||'.ghstore_union(internal,internal)'));
38+
39+
PERFORMpg_catalog.set_config('search_path', old_path, true);
40+
END
41+
$$;
2742

2843
ALTERFUNCTION hstore_in(cstring) PARALLEL SAFE;
2944
ALTERFUNCTION hstore_out(hstore) PARALLEL SAFE;

‎contrib/hstore_plperl/hstore_plperl.control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ comment = 'transform between hstore and plperl'
33
default_version = '1.0'
44
module_pathname = '$libdir/hstore_plperl'
55
relocatable = true
6-
trusted = true
76
requires = 'hstore,plperl'

‎contrib/intagg/intagg--1.0--1.1.sql

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66
ALTERFUNCTION int_agg_state(internal, int4) PARALLEL SAFE;
77
ALTERFUNCTION int_agg_final_array(internal) PARALLEL SAFE;
88
ALTERFUNCTION int_array_enum(int4[]) PARALLEL SAFE;
9+
DO LANGUAGE plpgsql
10+
$$
11+
DECLARE
12+
my_schemapg_catalog.text :=pg_catalog.quote_ident(pg_catalog.current_schema());
13+
old_pathpg_catalog.text :=pg_catalog.current_setting('search_path');
14+
BEGIN
15+
-- for safety, transiently set search_path to just pg_catalog+pg_temp
16+
PERFORMpg_catalog.set_config('search_path','pg_catalog, pg_temp', true);
917

1018
UPDATE pg_procSET proparallel='s'
11-
WHEREoid='int_array_aggregate(int4)'::pg_catalog.regprocedure;
19+
WHEREoid= (my_schema||'.int_array_aggregate(int4)')::pg_catalog.regprocedure;
20+
21+
PERFORMpg_catalog.set_config('search_path', old_path, true);
22+
END
23+
$$;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp