Add some additional casts and regression tests for the citext data type.

David Wheeler

contrib/citext/citext.sql.in

-/* $PostgreSQL: pgsql/contrib/citext/citext.sql.in,v 1.2 2008/07/30 17:08:52 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/citext/citext.sql.in,v 1.3 2008/09/05 18:25:16 tgl Exp $ */
 
 -- Adjust this setting to control where the objects get created.
 SET search_path = public;
@@ -22,22 +22,22 @@ CREATE TYPE citext;
 CREATE OR REPLACE FUNCTION citextin(cstring)
 RETURNS citext
 AS 'textin'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION citextout(citext)
 RETURNS cstring
 AS 'textout'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION citextrecv(internal)
 RETURNS citext
 AS 'textrecv'
-LANGUAGE 'internal' STABLE STRICT;
+LANGUAGE internal STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION citextsend(citext)
 RETURNS bytea
 AS 'textsend'
-LANGUAGE 'internal' STABLE STRICT;
+LANGUAGE internal STABLE STRICT;
 
 --
 --  The type itself.
@@ -56,13 +56,24 @@ CREATE TYPE citext (
 );
 
 --
--- A single cast function, since bpchar needs to have its whitespace trimmed
--- before it's cast to citext.
+-- Type casting functions for those situations where the I/O casts don't
+-- automatically kick in.
 --
+
 CREATE OR REPLACE FUNCTION citext(bpchar)
 RETURNS citext
 AS 'rtrim1'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
+
+CREATE OR REPLACE FUNCTION citext(boolean)
+RETURNS citext
+AS 'booltext'
+LANGUAGE internal IMMUTABLE STRICT;
+
+CREATE OR REPLACE FUNCTION citext(inet)
+RETURNS citext
+AS 'network_show'
+LANGUAGE internal IMMUTABLE STRICT;
 
 --
 --  Implicit and assignment type casts.
@@ -73,7 +84,9 @@ 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 (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.
@@ -243,19 +256,19 @@ CREATE AGGREGATE max(citext)  (
 
 CREATE OR REPLACE FUNCTION texticlike(citext, citext)
 RETURNS bool AS 'texticlike'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticnlike(citext, citext)
 RETURNS bool AS 'texticnlike'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticregexeq(citext, citext)
 RETURNS bool AS 'texticregexeq'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticregexne(citext, citext)
 RETURNS bool AS 'texticregexne'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OPERATOR ~ (
     PROCEDURE = texticregexeq,
@@ -335,19 +348,19 @@ CREATE OPERATOR !~~* (
 
 CREATE OR REPLACE FUNCTION texticlike(citext, text)
 RETURNS bool AS 'texticlike'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticnlike(citext, text)
 RETURNS bool AS 'texticnlike'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticregexeq(citext, text)
 RETURNS bool AS 'texticregexeq'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION texticregexne(citext, text)
 RETURNS bool AS 'texticregexne'
-LANGUAGE 'internal' IMMUTABLE STRICT;
+LANGUAGE internal IMMUTABLE STRICT;
 
 CREATE OPERATOR ~ (
     PROCEDURE = texticregexeq,
@@ -420,3 +433,56 @@ CREATE OPERATOR !~~* (
     RESTRICT  = icnlikesel,
     JOIN      = icnlikejoinsel
 );
+
+--
+-- Matching citext in string comparison functions.
+-- XXX TODO Ideally these would be implemented in C.
+--
+
+CREATE OR REPLACE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$
+    SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' );
+$$ LANGUAGE SQL IMMUTABLE STRICT;
+
+CREATE OR REPLACE FUNCTION regexp_matches( citext, citext, text ) RETURNS 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;
+
+CREATE OR REPLACE 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;

contrib/citext/uninstall_citext.sql

-/* $PostgreSQL: pgsql/contrib/citext/uninstall_citext.sql,v 1.2 2008/07/30 17:08:52 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/citext/uninstall_citext.sql,v 1.3 2008/09/05 18:25:16 tgl Exp $ */
 
 -- Adjust this setting to control where the objects get dropped.
 SET search_path = public;
@@ -40,8 +40,12 @@ DROP CAST (citext AS bpchar);
 DROP CAST (text AS citext);
 DROP CAST (varchar AS citext);
 DROP CAST (bpchar AS citext);
+DROP CAST (boolean AS citext);
+DROP CAST (inet AS citext);
 
 DROP FUNCTION citext(bpchar);
+DROP FUNCTION citext(boolean);
+DROP FUNCTION citext(inet);
 DROP FUNCTION citext_eq(citext, citext);
 DROP FUNCTION citext_ne(citext, citext);
 DROP FUNCTION citext_lt(citext, citext);
@@ -60,5 +64,17 @@ DROP FUNCTION texticlike(citext, text);
 DROP FUNCTION texticnlike(citext, text);
 DROP FUNCTION texticregexeq(citext, text);
 DROP FUNCTION texticregexne(citext, text);
+DROP FUNCTION regexp_matches( citext, citext );
+DROP FUNCTION regexp_matches( citext, citext, text );
+DROP FUNCTION regexp_replace( citext, citext, text );
+DROP FUNCTION regexp_replace( citext, citext, text, text );
+DROP FUNCTION regexp_split_to_array( citext, citext );
+DROP FUNCTION regexp_split_to_array( citext, citext, text );
+DROP FUNCTION regexp_split_to_table( citext, citext );
+DROP FUNCTION regexp_split_to_table( citext, citext, text );
+DROP FUNCTION strpos( citext, citext );
+DROP FUNCTION replace( citext, citext, citext );
+DROP FUNCTION split_part( citext, citext, int );
+DROP FUNCTION translate( citext, citext, text );
 
 DROP TYPE citext CASCADE;