summaryrefslogtreecommitdiff
path: root/contrib/citext
diff options
context:
space:
mode:
authorTom Lane2020-02-19 21:59:14 +0000
committerTom Lane2020-02-19 21:59:14 +0000
commit70a7732007bc4689f4c7a44e738eb2d892dac1e3 (patch)
treeee0e3600986e53e6028658dbe2d1bfad3e1f7606 /contrib/citext
parent2f9c46a32b43d72c9384378827ee51fde896807c (diff)
Remove support for upgrading extensions from "unpackaged" state.
Andres Freund pointed out that allowing non-superusers to run "CREATE EXTENSION ... FROM unpackaged" has security risks, since the unpackaged-to-1.0 scripts don't try to verify that the existing objects they're modifying are what they expect. Just attaching such objects to an extension doesn't seem too dangerous, but some of them do more than that. We could have resolved this, perhaps, by still requiring superuser privilege to use the FROM option. However, it's fair to ask just what we're accomplishing by continuing to lug the unpackaged-to-1.0 scripts forward. None of them have received any real testing since 9.1 days, so they may not even work anymore (even assuming that one could still load the previous "loose" object definitions into a v13 database). And an installation that's trying to go from pre-9.1 to v13 or later in one jump is going to have worse compatibility problems than whether there's a trivial way to convert their contrib modules into extension style. Hence, let's just drop both those scripts and the core-code support for "CREATE EXTENSION ... FROM". Discussion: https://postgr.es/m/20200213233015.r6rnubcvl4egdh5r@alap3.anarazel.de
Diffstat (limited to 'contrib/citext')
-rw-r--r--contrib/citext/Makefile2
-rw-r--r--contrib/citext/citext--unpackaged--1.0.sql200
2 files changed, 1 insertions, 201 deletions
diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile
index e37dcf9b584..a7de52928d7 100644
--- a/contrib/citext/Makefile
+++ b/contrib/citext/Makefile
@@ -8,7 +8,7 @@ DATA = citext--1.4.sql \
citext--1.4--1.5.sql \
citext--1.3--1.4.sql \
citext--1.2--1.3.sql citext--1.1--1.2.sql \
- citext--1.0--1.1.sql citext--unpackaged--1.0.sql
+ citext--1.0--1.1.sql
PGFILEDESC = "citext - case-insensitive character string data type"
REGRESS = citext
diff --git a/contrib/citext/citext--unpackaged--1.0.sql b/contrib/citext/citext--unpackaged--1.0.sql
deleted file mode 100644
index ef6d6b06396..00000000000
--- a/contrib/citext/citext--unpackaged--1.0.sql
+++ /dev/null
@@ -1,200 +0,0 @@
-/* contrib/citext/citext--unpackaged--1.0.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION citext FROM unpackaged" to load this file. \quit
-
-ALTER EXTENSION citext ADD type citext;
-ALTER EXTENSION citext ADD function citextin(cstring);
-ALTER EXTENSION citext ADD function citextout(citext);
-ALTER EXTENSION citext ADD function citextrecv(internal);
-ALTER EXTENSION citext ADD function citextsend(citext);
-ALTER EXTENSION citext ADD function citext(character);
-ALTER EXTENSION citext ADD function citext(boolean);
-ALTER EXTENSION citext ADD function citext(inet);
-ALTER EXTENSION citext ADD cast (citext as text);
-ALTER EXTENSION citext ADD cast (citext as character varying);
-ALTER EXTENSION citext ADD cast (citext as character);
-ALTER EXTENSION citext ADD cast (text as citext);
-ALTER EXTENSION citext ADD cast (character varying as citext);
-ALTER EXTENSION citext ADD cast (character as citext);
-ALTER EXTENSION citext ADD cast (boolean as citext);
-ALTER EXTENSION citext ADD cast (inet as citext);
-ALTER EXTENSION citext ADD function citext_eq(citext,citext);
-ALTER EXTENSION citext ADD function citext_ne(citext,citext);
-ALTER EXTENSION citext ADD function citext_lt(citext,citext);
-ALTER EXTENSION citext ADD function citext_le(citext,citext);
-ALTER EXTENSION citext ADD function citext_gt(citext,citext);
-ALTER EXTENSION citext ADD function citext_ge(citext,citext);
-ALTER EXTENSION citext ADD operator <>(citext,citext);
-ALTER EXTENSION citext ADD operator =(citext,citext);
-ALTER EXTENSION citext ADD operator >(citext,citext);
-ALTER EXTENSION citext ADD operator >=(citext,citext);
-ALTER EXTENSION citext ADD operator <(citext,citext);
-ALTER EXTENSION citext ADD operator <=(citext,citext);
-ALTER EXTENSION citext ADD function citext_cmp(citext,citext);
-ALTER EXTENSION citext ADD function citext_hash(citext);
-ALTER EXTENSION citext ADD operator family citext_ops using btree;
-ALTER EXTENSION citext ADD operator class citext_ops using btree;
-ALTER EXTENSION citext ADD operator family citext_ops using hash;
-ALTER EXTENSION citext ADD operator class citext_ops using hash;
-ALTER EXTENSION citext ADD function citext_smaller(citext,citext);
-ALTER EXTENSION citext ADD function citext_larger(citext,citext);
-ALTER EXTENSION citext ADD function min(citext);
-ALTER EXTENSION citext ADD function max(citext);
-ALTER EXTENSION citext ADD function texticlike(citext,citext);
-ALTER EXTENSION citext ADD function texticnlike(citext,citext);
-ALTER EXTENSION citext ADD function texticregexeq(citext,citext);
-ALTER EXTENSION citext ADD function texticregexne(citext,citext);
-ALTER EXTENSION citext ADD operator !~(citext,citext);
-ALTER EXTENSION citext ADD operator ~(citext,citext);
-ALTER EXTENSION citext ADD operator !~*(citext,citext);
-ALTER EXTENSION citext ADD operator ~*(citext,citext);
-ALTER EXTENSION citext ADD operator !~~(citext,citext);
-ALTER EXTENSION citext ADD operator ~~(citext,citext);
-ALTER EXTENSION citext ADD operator !~~*(citext,citext);
-ALTER EXTENSION citext ADD operator ~~*(citext,citext);
-ALTER EXTENSION citext ADD function texticlike(citext,text);
-ALTER EXTENSION citext ADD function texticnlike(citext,text);
-ALTER EXTENSION citext ADD function texticregexeq(citext,text);
-ALTER EXTENSION citext ADD function texticregexne(citext,text);
-ALTER EXTENSION citext ADD operator !~(citext,text);
-ALTER EXTENSION citext ADD operator ~(citext,text);
-ALTER EXTENSION citext ADD operator !~*(citext,text);
-ALTER EXTENSION citext ADD operator ~*(citext,text);
-ALTER EXTENSION citext ADD operator !~~(citext,text);
-ALTER EXTENSION citext ADD operator ~~(citext,text);
-ALTER EXTENSION citext ADD operator !~~*(citext,text);
-ALTER EXTENSION citext ADD operator ~~*(citext,text);
-ALTER EXTENSION citext ADD function regexp_matches(citext,citext);
-ALTER EXTENSION citext ADD function regexp_matches(citext,citext,text);
-ALTER EXTENSION citext ADD function regexp_replace(citext,citext,text);
-ALTER EXTENSION citext ADD function regexp_replace(citext,citext,text,text);
-ALTER EXTENSION citext ADD function regexp_split_to_array(citext,citext);
-ALTER EXTENSION citext ADD function regexp_split_to_array(citext,citext,text);
-ALTER EXTENSION citext ADD function regexp_split_to_table(citext,citext);
-ALTER EXTENSION citext ADD function regexp_split_to_table(citext,citext,text);
-ALTER EXTENSION citext ADD function strpos(citext,citext);
-ALTER EXTENSION citext ADD function replace(citext,citext,citext);
-ALTER EXTENSION citext ADD function split_part(citext,citext,integer);
-ALTER EXTENSION citext ADD function translate(citext,citext,text);
-
---
--- As of 9.1, type citext should be marked collatable. There is no ALTER TYPE
--- command for this, so we have to do it by poking the pg_type entry directly.
--- We have to poke any derived copies in pg_attribute or pg_index as well,
--- as well as those for arrays/domains based directly or indirectly on citext.
--- Notes: 100 is the OID of the "pg_catalog.default" collation --- it seems
--- easier and more reliable to hard-wire that here than to pull it out of
--- pg_collation. Also, we don't need to make pg_depend entries since the
--- default collation is pinned.
---
-
-WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
-UPDATE pg_catalog.pg_type SET typcollation = 100
-FROM typeoids
-WHERE oid = typeoids.typoid;
-
-WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
-UPDATE pg_catalog.pg_attribute SET attcollation = 100
-FROM typeoids
-WHERE atttypid = typeoids.typoid;
-
--- Updating the index indcollations is particularly tedious, but since we
--- don't currently allow SQL assignment to individual elements of oidvectors,
--- there's little choice.
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, '^0', '100')::pg_catalog.oidvector
-WHERE indclass[0] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[1] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[2] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[3] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+ \\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[4] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+ \\d+ \\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[5] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+ \\d+ \\d+ \\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[6] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
-UPDATE pg_catalog.pg_index SET indcollation =
- pg_catalog.regexp_replace(indcollation::pg_catalog.text, E'^(\\d+ \\d+ \\d+ \\d+ \\d+ \\d+ \\d+) 0', E'\\1 100')::pg_catalog.oidvector
-WHERE indclass[7] IN (
- WITH RECURSIVE typeoids(typoid) AS
- ( SELECT 'citext'::pg_catalog.regtype UNION
- SELECT oid FROM pg_catalog.pg_type, typeoids
- WHERE typelem = typoid OR typbasetype = typoid )
- SELECT oid FROM pg_catalog.pg_opclass, typeoids
- WHERE opcintype = typeoids.typoid
-);
-
--- somewhat arbitrarily, we assume no citext indexes have more than 8 columns