Skip to content

Commit 063744a

Browse files
tjgreen42tjgreen42
committed
fix: qualify catalog operators in privilege cleanup
1 parent 90d865e commit 063744a

2 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎sql/pg_textsearch--1.4.0--1.5.0-dev.sql‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,30 @@ BEGIN
6666
grantee.rolname AS grantee_name
6767
FROM pg_catalog.pg_extension extension
6868
JOIN pg_catalog.pg_depend dependency
69-
ON dependency.refclassid =
69+
ON dependency.refclassid OPERATOR(pg_catalog.=)
7070
'pg_catalog.pg_extension'::pg_catalog.regclass
71-
AND dependency.refobjid = extension.oid
72-
AND dependency.classid =
71+
AND dependency.refobjid OPERATOR(pg_catalog.=) extension.oid
72+
AND dependency.classid OPERATOR(pg_catalog.=)
7373
'pg_catalog.pg_proc'::pg_catalog.regclass
74-
AND dependency.deptype = 'e'
74+
AND dependency.deptype OPERATOR(pg_catalog.=) 'e'
7575
JOIN pg_catalog.pg_proc procedure
76-
ON procedure.oid = dependency.objid
76+
ON procedure.oid OPERATOR(pg_catalog.=) dependency.objid
7777
JOIN pg_catalog.pg_namespace namespace
78-
ON namespace.oid = procedure.pronamespace
78+
ON namespace.oid OPERATOR(pg_catalog.=)
79+
procedure.pronamespace
7980
CROSS JOIN LATERAL pg_catalog.aclexplode(
8081
coalesce(
8182
procedure.proacl,
8283
pg_catalog.acldefault(
8384
'f', procedure.proowner))) acl
8485
JOIN pg_catalog.pg_roles grantee
85-
ON grantee.oid = acl.grantee
86-
WHERE extension.extname = 'pg_textsearch'
87-
AND procedure.proname IN (
86+
ON grantee.oid OPERATOR(pg_catalog.=) acl.grantee
87+
WHERE extension.extname OPERATOR(pg_catalog.=) 'pg_textsearch'
88+
AND procedure.proname OPERATOR(pg_catalog.=) ANY (ARRAY[
8889
'bm25_compact_step_if_current',
89-
'bm25_needs_compaction_if_current')
90-
AND procedure.pronargs = 4
91-
AND acl.grantee <> procedure.proowner
90+
'bm25_needs_compaction_if_current'])
91+
AND procedure.pronargs OPERATOR(pg_catalog.=) 4
92+
AND acl.grantee OPERATOR(pg_catalog.<>) procedure.proowner
9293
LOOP
9394
EXECUTE pg_catalog.format(
9495
'REVOKE ALL ON FUNCTION %I.%I('

‎sql/pg_textsearch--1.5.0-dev.sql‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -306,29 +306,30 @@ BEGIN
306306
grantee.rolname AS grantee_name
307307
FROM pg_catalog.pg_extension extension
308308
JOIN pg_catalog.pg_depend dependency
309-
ON dependency.refclassid =
309+
ON dependency.refclassid OPERATOR(pg_catalog.=)
310310
'pg_catalog.pg_extension'::pg_catalog.regclass
311-
AND dependency.refobjid = extension.oid
312-
AND dependency.classid =
311+
AND dependency.refobjid OPERATOR(pg_catalog.=) extension.oid
312+
AND dependency.classid OPERATOR(pg_catalog.=)
313313
'pg_catalog.pg_proc'::pg_catalog.regclass
314-
AND dependency.deptype = 'e'
314+
AND dependency.deptype OPERATOR(pg_catalog.=) 'e'
315315
JOIN pg_catalog.pg_proc procedure
316-
ON procedure.oid = dependency.objid
316+
ON procedure.oid OPERATOR(pg_catalog.=) dependency.objid
317317
JOIN pg_catalog.pg_namespace namespace
318-
ON namespace.oid = procedure.pronamespace
318+
ON namespace.oid OPERATOR(pg_catalog.=)
319+
procedure.pronamespace
319320
CROSS JOIN LATERAL pg_catalog.aclexplode(
320321
coalesce(
321322
procedure.proacl,
322323
pg_catalog.acldefault(
323324
'f', procedure.proowner))) acl
324325
JOIN pg_catalog.pg_roles grantee
325-
ON grantee.oid = acl.grantee
326-
WHERE extension.extname = 'pg_textsearch'
327-
AND procedure.proname IN (
326+
ON grantee.oid OPERATOR(pg_catalog.=) acl.grantee
327+
WHERE extension.extname OPERATOR(pg_catalog.=) 'pg_textsearch'
328+
AND procedure.proname OPERATOR(pg_catalog.=) ANY (ARRAY[
328329
'bm25_compact_step_if_current',
329-
'bm25_needs_compaction_if_current')
330-
AND procedure.pronargs = 4
331-
AND acl.grantee <> procedure.proowner
330+
'bm25_needs_compaction_if_current'])
331+
AND procedure.pronargs OPERATOR(pg_catalog.=) 4
332+
AND acl.grantee OPERATOR(pg_catalog.<>) procedure.proowner
332333
LOOP
333334
EXECUTE pg_catalog.format(
334335
'REVOKE ALL ON FUNCTION %I.%I('

0 commit comments

Comments
 (0)