On 30 June 2016 at 03:49, Robert Haas <robertmh...@gmail.com> wrote: > On Sat, Jun 25, 2016 at 3:44 AM, Andreas Karlsson <andr...@proxel.se> wrote: >> On 06/24/2016 01:31 PM, David Rowley wrote: >>> Seems there's a small error in the upgrade script for citext for 1.1 >>> to 1.2 which will cause min(citext) not to be parallel enabled. >>> >>> max(citext)'s combinefunc is first set incorrectly, but then updated >>> to the correct value. I assume it was meant to set the combine >>> function for min(citext) instead. >>> >>> Fix attached. I've assumed that because we're still in beta that we >>> can get away with this fix rather than making a 1.3 version to fix the >>> issue. >> >> Yes, this is indeed a bug. > > Since we've already released beta2, I think we need to do a whole new > extension version. We treated beta1 as a sufficiently-significant > event to mandate a version bump, so we should do the same here.
Ok, good point. Patch attached. -- David Rowley http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services
From bb9e38894f928b47260f5fd9ba34535b47be3d88 Mon Sep 17 00:00:00 2001 From: David Rowley <dgrow...@gmail.com> Date: Sat, 9 Jul 2016 15:37:33 +1200 Subject: [PATCH] Add missing combine function for min(citext) This would have been set correctly for new installs of 1.2, but the upgrade step from 1.1 to 1.2 was incorrect and instead of setting the combine function for min(citext) max(citext) was set twice. --- contrib/citext/Makefile | 4 +- contrib/citext/citext--1.2--1.3.sql | 7 + contrib/citext/citext--1.2.sql | 493 ------------------------------------ contrib/citext/citext--1.3.sql | 493 ++++++++++++++++++++++++++++++++++++ contrib/citext/citext.control | 2 +- 5 files changed, 503 insertions(+), 496 deletions(-) create mode 100644 contrib/citext/citext--1.2--1.3.sql delete mode 100644 contrib/citext/citext--1.2.sql create mode 100644 contrib/citext/citext--1.3.sql diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile index 363a11b..e39d3ee 100644 --- a/contrib/citext/Makefile +++ b/contrib/citext/Makefile @@ -3,8 +3,8 @@ MODULES = citext EXTENSION = citext -DATA = citext--1.2.sql citext--1.1--1.2.sql citext--1.0--1.1.sql \ - citext--unpackaged--1.0.sql +DATA = citext--1.3.sql citext--1.2--1.3.sql citext--1.1--1.2.sql \ + citext--1.0--1.1.sql citext--unpackaged--1.0.sql PGFILEDESC = "citext - case-insensitive character string data type" REGRESS = citext diff --git a/contrib/citext/citext--1.2--1.3.sql b/contrib/citext/citext--1.2--1.3.sql new file mode 100644 index 0000000..4ab8679 --- /dev/null +++ b/contrib/citext/citext--1.2--1.3.sql @@ -0,0 +1,7 @@ +/* contrib/citext/citext--1.2--1.3.sql */ + +-- complain if script is sourced in psql, rather than via ALTER EXTENSION +\echo Use "ALTER EXTENSION citext UPDATE TO '1.3'" to load this file. \quit + +UPDATE pg_aggregate SET aggcombinefn = 'citext_smaller' +WHERE aggfnoid = 'min(citext)'::pg_catalog.regprocedure; diff --git a/contrib/citext/citext--1.2.sql b/contrib/citext/citext--1.2.sql deleted file mode 100644 index c2d0c0c..0000000 --- a/contrib/citext/citext--1.2.sql +++ /dev/null @@ -1,493 +0,0 @@ -/* contrib/citext/citext--1.2.sql */ - --- complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "CREATE EXTENSION citext" to load this file. \quit - --- --- PostgreSQL code for CITEXT. --- --- Most I/O functions, and a few others, piggyback on the "text" type --- functions via the implicit cast to text. --- - --- --- Shell type to keep things a bit quieter. --- - -CREATE TYPE citext; - --- --- Input and output functions. --- -CREATE FUNCTION citextin(cstring) -RETURNS citext -AS 'textin' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citextout(citext) -RETURNS cstring -AS 'textout' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citextrecv(internal) -RETURNS citext -AS 'textrecv' -LANGUAGE internal STABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citextsend(citext) -RETURNS bytea -AS 'textsend' -LANGUAGE internal STABLE STRICT PARALLEL SAFE; - --- --- The type itself. --- - -CREATE TYPE citext ( - INPUT = citextin, - OUTPUT = citextout, - RECEIVE = citextrecv, - SEND = citextsend, - INTERNALLENGTH = VARIABLE, - STORAGE = extended, - -- make it a non-preferred member of string type category - CATEGORY = 'S', - PREFERRED = false, - COLLATABLE = true -); - --- --- Type casting functions for those situations where the I/O casts don't --- automatically kick in. --- - -CREATE FUNCTION citext(bpchar) -RETURNS citext -AS 'rtrim1' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext(boolean) -RETURNS citext -AS 'booltext' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext(inet) -RETURNS citext -AS 'network_show' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - --- --- Implicit and assignment type casts. --- - -CREATE CAST (citext AS text) WITHOUT FUNCTION AS IMPLICIT; -CREATE CAST (citext AS varchar) WITHOUT FUNCTION AS IMPLICIT; -CREATE CAST (citext AS bpchar) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (text AS citext) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (varchar AS citext) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (bpchar AS citext) WITH FUNCTION citext(bpchar) AS ASSIGNMENT; -CREATE CAST (boolean AS citext) WITH FUNCTION citext(boolean) AS ASSIGNMENT; -CREATE CAST (inet AS citext) WITH FUNCTION citext(inet) AS ASSIGNMENT; - --- --- Operator Functions. --- - -CREATE FUNCTION citext_eq( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_ne( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_lt( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_le( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_gt( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_ge( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - --- --- Operators. --- - -CREATE OPERATOR = ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - COMMUTATOR = =, - NEGATOR = <>, - PROCEDURE = citext_eq, - RESTRICT = eqsel, - JOIN = eqjoinsel, - HASHES, - MERGES -); - -CREATE OPERATOR <> ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = =, - COMMUTATOR = <>, - PROCEDURE = citext_ne, - RESTRICT = neqsel, - JOIN = neqjoinsel -); - -CREATE OPERATOR < ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = >=, - COMMUTATOR = >, - PROCEDURE = citext_lt, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR <= ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = >, - COMMUTATOR = >=, - PROCEDURE = citext_le, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR >= ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = <, - COMMUTATOR = <=, - PROCEDURE = citext_ge, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - -CREATE OPERATOR > ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = <=, - COMMUTATOR = <, - PROCEDURE = citext_gt, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - --- --- Support functions for indexing. --- - -CREATE FUNCTION citext_cmp(citext, citext) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE; - -CREATE FUNCTION citext_hash(citext) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE; - --- --- The btree indexing operator class. --- - -CREATE OPERATOR CLASS citext_ops -DEFAULT FOR TYPE CITEXT USING btree AS - OPERATOR 1 < (citext, citext), - OPERATOR 2 <= (citext, citext), - OPERATOR 3 = (citext, citext), - OPERATOR 4 >= (citext, citext), - OPERATOR 5 > (citext, citext), - FUNCTION 1 citext_cmp(citext, citext); - --- --- The hash indexing operator class. --- - -CREATE OPERATOR CLASS citext_ops -DEFAULT FOR TYPE citext USING hash AS - OPERATOR 1 = (citext, citext), - FUNCTION 1 citext_hash(citext); - --- --- Aggregates. --- - -CREATE FUNCTION citext_smaller(citext, citext) -RETURNS citext -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION citext_larger(citext, citext) -RETURNS citext -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE AGGREGATE min(citext) ( - SFUNC = citext_smaller, - STYPE = citext, - SORTOP = <, - PARALLEL = SAFE, - COMBINEFUNC = citext_smaller -); - -CREATE AGGREGATE max(citext) ( - SFUNC = citext_larger, - STYPE = citext, - SORTOP = >, - PARALLEL = SAFE, - COMBINEFUNC = citext_larger -); - --- --- CITEXT pattern matching. --- - -CREATE FUNCTION texticlike(citext, citext) -RETURNS bool AS 'texticlike' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticnlike(citext, citext) -RETURNS bool AS 'texticnlike' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticregexeq(citext, citext) -RETURNS bool AS 'texticregexeq' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticregexne(citext, citext) -RETURNS bool AS 'texticregexne' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE OPERATOR ~ ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR ~* ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~*, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR !~ ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR !~* ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~*, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR ~~ ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~~, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR ~~* ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~~*, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR !~~ ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~~, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - -CREATE OPERATOR !~~* ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~~*, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - --- --- Matching citext to text. --- - -CREATE FUNCTION texticlike(citext, text) -RETURNS bool AS 'texticlike' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticnlike(citext, text) -RETURNS bool AS 'texticnlike' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticregexeq(citext, text) -RETURNS bool AS 'texticregexeq' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION texticregexne(citext, text) -RETURNS bool AS 'texticregexne' -LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; - -CREATE OPERATOR ~ ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR ~* ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~*, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR !~ ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR !~* ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~*, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR ~~ ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~~, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR ~~* ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~~*, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR !~~ ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~~, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - -CREATE OPERATOR !~~* ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~~*, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - --- --- Matching citext in string comparison functions. --- XXX TODO Ideally these would be implemented in C. --- - -CREATE FUNCTION regexp_matches( citext, citext ) RETURNS SETOF TEXT[] AS $$ - SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE ROWS 1; - -CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS SETOF TEXT[] AS $$ - SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE ROWS 10; - -CREATE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i'); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, CASE WHEN pg_catalog.strpos($4, 'c') = 0 THEN $4 || 'i' ELSE $4 END); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ - SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ - SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ - SELECT pg_catalog.strpos( pg_catalog.lower( $1::pg_catalog.text ), pg_catalog.lower( $2::pg_catalog.text ) ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), $3::pg_catalog.text, 'gi' ); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ - SELECT (pg_catalog.regexp_split_to_array( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), 'i'))[$3]; -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ - SELECT pg_catalog.translate( pg_catalog.translate( $1::pg_catalog.text, pg_catalog.lower($2::pg_catalog.text), $3), pg_catalog.upper($2::pg_catalog.text), $3); -$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; diff --git a/contrib/citext/citext--1.3.sql b/contrib/citext/citext--1.3.sql new file mode 100644 index 0000000..c2d0c0c --- /dev/null +++ b/contrib/citext/citext--1.3.sql @@ -0,0 +1,493 @@ +/* contrib/citext/citext--1.2.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION citext" to load this file. \quit + +-- +-- PostgreSQL code for CITEXT. +-- +-- Most I/O functions, and a few others, piggyback on the "text" type +-- functions via the implicit cast to text. +-- + +-- +-- Shell type to keep things a bit quieter. +-- + +CREATE TYPE citext; + +-- +-- Input and output functions. +-- +CREATE FUNCTION citextin(cstring) +RETURNS citext +AS 'textin' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citextout(citext) +RETURNS cstring +AS 'textout' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citextrecv(internal) +RETURNS citext +AS 'textrecv' +LANGUAGE internal STABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citextsend(citext) +RETURNS bytea +AS 'textsend' +LANGUAGE internal STABLE STRICT PARALLEL SAFE; + +-- +-- The type itself. +-- + +CREATE TYPE citext ( + INPUT = citextin, + OUTPUT = citextout, + RECEIVE = citextrecv, + SEND = citextsend, + INTERNALLENGTH = VARIABLE, + STORAGE = extended, + -- make it a non-preferred member of string type category + CATEGORY = 'S', + PREFERRED = false, + COLLATABLE = true +); + +-- +-- Type casting functions for those situations where the I/O casts don't +-- automatically kick in. +-- + +CREATE FUNCTION citext(bpchar) +RETURNS citext +AS 'rtrim1' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext(boolean) +RETURNS citext +AS 'booltext' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext(inet) +RETURNS citext +AS 'network_show' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +-- +-- Implicit and assignment type casts. +-- + +CREATE CAST (citext AS text) WITHOUT FUNCTION AS IMPLICIT; +CREATE CAST (citext AS varchar) WITHOUT FUNCTION AS IMPLICIT; +CREATE CAST (citext AS bpchar) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (text AS citext) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (varchar AS citext) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (bpchar AS citext) WITH FUNCTION citext(bpchar) AS ASSIGNMENT; +CREATE CAST (boolean AS citext) WITH FUNCTION citext(boolean) AS ASSIGNMENT; +CREATE CAST (inet AS citext) WITH FUNCTION citext(inet) AS ASSIGNMENT; + +-- +-- Operator Functions. +-- + +CREATE FUNCTION citext_eq( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_ne( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_lt( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_le( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_gt( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_ge( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +-- +-- Operators. +-- + +CREATE OPERATOR = ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + COMMUTATOR = =, + NEGATOR = <>, + PROCEDURE = citext_eq, + RESTRICT = eqsel, + JOIN = eqjoinsel, + HASHES, + MERGES +); + +CREATE OPERATOR <> ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = =, + COMMUTATOR = <>, + PROCEDURE = citext_ne, + RESTRICT = neqsel, + JOIN = neqjoinsel +); + +CREATE OPERATOR < ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = >=, + COMMUTATOR = >, + PROCEDURE = citext_lt, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR <= ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = >, + COMMUTATOR = >=, + PROCEDURE = citext_le, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR >= ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = <, + COMMUTATOR = <=, + PROCEDURE = citext_ge, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +CREATE OPERATOR > ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = <=, + COMMUTATOR = <, + PROCEDURE = citext_gt, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +-- +-- Support functions for indexing. +-- + +CREATE FUNCTION citext_cmp(citext, citext) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE; + +CREATE FUNCTION citext_hash(citext) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE; + +-- +-- The btree indexing operator class. +-- + +CREATE OPERATOR CLASS citext_ops +DEFAULT FOR TYPE CITEXT USING btree AS + OPERATOR 1 < (citext, citext), + OPERATOR 2 <= (citext, citext), + OPERATOR 3 = (citext, citext), + OPERATOR 4 >= (citext, citext), + OPERATOR 5 > (citext, citext), + FUNCTION 1 citext_cmp(citext, citext); + +-- +-- The hash indexing operator class. +-- + +CREATE OPERATOR CLASS citext_ops +DEFAULT FOR TYPE citext USING hash AS + OPERATOR 1 = (citext, citext), + FUNCTION 1 citext_hash(citext); + +-- +-- Aggregates. +-- + +CREATE FUNCTION citext_smaller(citext, citext) +RETURNS citext +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION citext_larger(citext, citext) +RETURNS citext +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE AGGREGATE min(citext) ( + SFUNC = citext_smaller, + STYPE = citext, + SORTOP = <, + PARALLEL = SAFE, + COMBINEFUNC = citext_smaller +); + +CREATE AGGREGATE max(citext) ( + SFUNC = citext_larger, + STYPE = citext, + SORTOP = >, + PARALLEL = SAFE, + COMBINEFUNC = citext_larger +); + +-- +-- CITEXT pattern matching. +-- + +CREATE FUNCTION texticlike(citext, citext) +RETURNS bool AS 'texticlike' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticnlike(citext, citext) +RETURNS bool AS 'texticnlike' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticregexeq(citext, citext) +RETURNS bool AS 'texticregexeq' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticregexne(citext, citext) +RETURNS bool AS 'texticregexne' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE OPERATOR ~ ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR ~* ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~*, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR !~ ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR !~* ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~*, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR ~~ ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~~, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR ~~* ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~~*, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR !~~ ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~~, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +CREATE OPERATOR !~~* ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~~*, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +-- +-- Matching citext to text. +-- + +CREATE FUNCTION texticlike(citext, text) +RETURNS bool AS 'texticlike' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticnlike(citext, text) +RETURNS bool AS 'texticnlike' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticregexeq(citext, text) +RETURNS bool AS 'texticregexeq' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION texticregexne(citext, text) +RETURNS bool AS 'texticregexne' +LANGUAGE internal IMMUTABLE STRICT PARALLEL SAFE; + +CREATE OPERATOR ~ ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR ~* ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~*, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR !~ ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR !~* ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~*, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR ~~ ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~~, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR ~~* ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~~*, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR !~~ ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~~, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +CREATE OPERATOR !~~* ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~~*, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +-- +-- Matching citext in string comparison functions. +-- XXX TODO Ideally these would be implemented in C. +-- + +CREATE FUNCTION regexp_matches( citext, citext ) RETURNS SETOF TEXT[] AS $$ + SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE ROWS 1; + +CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS SETOF TEXT[] AS $$ + SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE ROWS 10; + +CREATE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i'); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, CASE WHEN pg_catalog.strpos($4, 'c') = 0 THEN $4 || 'i' ELSE $4 END); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ + SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ + SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ + SELECT pg_catalog.strpos( pg_catalog.lower( $1::pg_catalog.text ), pg_catalog.lower( $2::pg_catalog.text ) ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), $3::pg_catalog.text, 'gi' ); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ + SELECT (pg_catalog.regexp_split_to_array( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), 'i'))[$3]; +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ + SELECT pg_catalog.translate( pg_catalog.translate( $1::pg_catalog.text, pg_catalog.lower($2::pg_catalog.text), $3), pg_catalog.upper($2::pg_catalog.text), $3); +$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE; diff --git a/contrib/citext/citext.control b/contrib/citext/citext.control index 7cba65d..5f080df 100644 --- a/contrib/citext/citext.control +++ b/contrib/citext/citext.control @@ -1,5 +1,5 @@ # citext extension comment = 'data type for case-insensitive character strings' -default_version = '1.2' +default_version = '1.3' module_pathname = '$libdir/citext' relocatable = true -- 2.7.4
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
