Skip to content

Commit 57c88b7

Browse files
x4mx4m
authored
style: qualify pg_catalog schema references in extension SQL (#271)
Add explicit `pg_catalog.` prefix to all unqualified system catalog references in extension scripts and update paths (`pg_amproc`, `pg_opclass`, `pg_am`, `pg_operator`).
1 parent 4c04103 commit 57c88b7

8 files changed

Lines changed: 29 additions & 29 deletions

‎pgvectorscale/sql/vectorscale--0.4.0--0.5.0.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ BEGIN
8989
ELSIF have_l2_ops = 0 THEN
9090
-- Upgrade to add L2 distance support and update cosine opclass to
9191
-- include the distance_type_cosine function
92-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
93-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
94-
FROM pg_opclass c, pg_am a
92+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
93+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
94+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
9595
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
9696

9797
CREATE OPERATOR CLASS vector_l2_ops

‎pgvectorscale/sql/vectorscale--0.5.0--0.5.1.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ BEGIN
8989
ELSIF have_l2_ops = 0 THEN
9090
-- Upgrade to add L2 distance support and update cosine opclass to
9191
-- include the distance_type_cosine function
92-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
93-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
94-
FROM pg_opclass c, pg_am a
92+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
93+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
94+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
9595
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
9696

9797
CREATE OPERATOR CLASS vector_l2_ops

‎pgvectorscale/sql/vectorscale--0.5.1--0.6.0.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ BEGIN
102102
ELSIF have_l2_ops = 0 THEN
103103
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
104104
-- the distance_type_cosine function.
105-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
106-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
107-
FROM pg_opclass c, pg_am a
105+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
106+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
107+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
108108
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
109109
END IF;
110110

‎pgvectorscale/sql/vectorscale--0.6.0--0.7.0.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ BEGIN
124124
ELSIF have_l2_ops = 0 THEN
125125
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
126126
-- the distance_type_cosine function.
127-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129-
FROM pg_opclass c, pg_am a
127+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
130130
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
131131
END IF;
132132

@@ -146,7 +146,7 @@ BEGIN
146146

147147
-- First, check if the && operator exists for smallint[]
148148
IF NOT EXISTS (
149-
SELECT 1 FROM pg_operator
149+
SELECT 1 FROM pg_catalog.pg_operator
150150
WHERE oprname = '&&'
151151
AND oprleft = 'smallint[]'::regtype
152152
AND oprright = 'smallint[]'::regtype

‎pgvectorscale/sql/vectorscale--0.7.0--0.7.1.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ BEGIN
124124
ELSIF have_l2_ops = 0 THEN
125125
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
126126
-- the distance_type_cosine function.
127-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129-
FROM pg_opclass c, pg_am a
127+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
130130
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
131131
END IF;
132132

@@ -146,7 +146,7 @@ BEGIN
146146

147147
-- First, check if the && operator exists for smallint[]
148148
IF NOT EXISTS (
149-
SELECT 1 FROM pg_operator
149+
SELECT 1 FROM pg_catalog.pg_operator
150150
WHERE oprname = '&&'
151151
AND oprleft = 'smallint[]'::regtype
152152
AND oprright = 'smallint[]'::regtype

‎pgvectorscale/sql/vectorscale--0.7.1--0.8.0.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ BEGIN
124124
ELSIF have_l2_ops = 0 THEN
125125
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
126126
-- the distance_type_cosine function.
127-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129-
FROM pg_opclass c, pg_am a
127+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
130130
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
131131
END IF;
132132

@@ -146,7 +146,7 @@ BEGIN
146146

147147
-- First, check if the && operator exists for smallint[]
148148
IF NOT EXISTS (
149-
SELECT 1 FROM pg_operator
149+
SELECT 1 FROM pg_catalog.pg_operator
150150
WHERE oprname = '&&'
151151
AND oprleft = 'smallint[]'::regtype
152152
AND oprright = 'smallint[]'::regtype

‎pgvectorscale/sql/vectorscale--0.8.0--0.9.0.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ BEGIN
124124
ELSIF have_l2_ops = 0 THEN
125125
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
126126
-- the distance_type_cosine function.
127-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129-
FROM pg_opclass c, pg_am a
127+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
128+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
129+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
130130
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
131131
END IF;
132132

@@ -146,7 +146,7 @@ BEGIN
146146

147147
-- First, check if the && operator exists for smallint[]
148148
IF NOT EXISTS (
149-
SELECT 1 FROM pg_operator
149+
SELECT 1 FROM pg_catalog.pg_operator
150150
WHERE oprname = '&&'
151151
AND oprleft = 'smallint[]'::regtype
152152
AND oprright = 'smallint[]'::regtype

‎pgvectorscale/src/access_method/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ BEGIN
212212
ELSIF have_l2_ops = 0 THEN
213213
-- Upgrade from 0.4.0 to 0.5.0. Update cosine opclass to include
214214
-- the distance_type_cosine function.
215-
INSERT INTO pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
216-
SELECT (select (max(oid)::int + 1)::oid from pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
217-
FROM pg_opclass c, pg_am a
215+
INSERT INTO pg_catalog.pg_amproc (oid, amprocfamily, amproclefttype, amprocrighttype, amprocnum, amproc)
216+
SELECT (select (max(oid)::int + 1)::oid from pg_catalog.pg_amproc), c.opcfamily, c.opcintype, c.opcintype, 1, '@extschema@.distance_type_l2'::regproc
217+
FROM pg_catalog.pg_opclass c, pg_catalog.pg_am a
218218
WHERE a.oid = c.opcmethod AND c.opcname = 'vector_cosine_ops' AND a.amname = 'diskann';
219219
END IF;
220220
@@ -234,7 +234,7 @@ BEGIN
234234
235235
-- First, check if the && operator exists for smallint[]
236236
IF NOT EXISTS (
237-
SELECT 1 FROM pg_operator
237+
SELECT 1 FROM pg_catalog.pg_operator
238238
WHERE oprname = '&&'
239239
AND oprleft = 'smallint[]'::regtype
240240
AND oprright = 'smallint[]'::regtype

0 commit comments

Comments
 (0)