git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile

index e39d3eee61bb5b59f72d0aae452acc7340c38783..563cd22dcccbb53222ea42aea499e6498e904b8d 100644 (file)

--- a/contrib/citext/Makefile

+++ b/contrib/citext/Makefile

MODULES = citext

EXTENSION = citext

-DATA = citext--1.3.sql citext--1.2--1.3.sql citext--1.1--1.2.sql \

+DATA = citext--1.4.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

PGFILEDESC = "citext - case-insensitive character string data type"

diff --git a/contrib/citext/citext--1.3--1.4.sql b/contrib/citext/citext--1.3--1.4.sql

new file mode 100644 (file)
index 0000000..7b36651

--- /dev/null

+++ b/contrib/citext/citext--1.3--1.4.sql

+/* contrib/citext/citext--1.3--1.4.sql */

+

+-- complain if script is sourced in psql, rather than via ALTER EXTENSION

+\echo Use "ALTER EXTENSION citext UPDATE TO '1.4'" to load this file. \quit

+

+CREATE FUNCTION regexp_match( citext, citext ) RETURNS TEXT[] AS $$

+ SELECT pg_catalog.regexp_match( 1ドル::pg_catalog.text, 2ドル::pg_catalog.text, 'i' );

+$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE;

+

+CREATE FUNCTION regexp_match( citext, citext, text ) RETURNS TEXT[] AS $$

+ SELECT pg_catalog.regexp_match( 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;

diff --git a/contrib/citext/citext--1.3.sql b/contrib/citext/citext--1.4.sql

similarity index 96%
rename from contrib/citext/citext--1.3.sql
rename to contrib/citext/citext--1.4.sql
index c2d0c0ce9be6d5c47a29648e1090cb75a0f73e56..7b0619893527ac9a5c7756a35456167de97a6566 100644 (file)

--- a/contrib/citext/citext--1.3.sql

+++ b/contrib/citext/citext--1.4.sql

-/* contrib/citext/citext--1.2.sql */

+/* contrib/citext/citext--1.4.sql */

-- complain if script is sourced in psql, rather than via CREATE EXTENSION

\echo Use "CREATE EXTENSION citext" to load this file. \quit

-- XXX TODO Ideally these would be implemented in C.

--

+CREATE FUNCTION regexp_match( citext, citext ) RETURNS TEXT[] AS $$

+ SELECT pg_catalog.regexp_match( 1ドル::pg_catalog.text, 2ドル::pg_catalog.text, 'i' );

+$$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE;

+

+CREATE FUNCTION regexp_match( citext, citext, text ) RETURNS TEXT[] AS $$

+ SELECT pg_catalog.regexp_match( 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_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;

diff --git a/contrib/citext/citext.control b/contrib/citext/citext.control

index 5f080df3ee3777d57c21047229e4ab066225a930..17fce4e887dd6c6cc4f4beadd4bdfad7b504c0ad 100644 (file)

--- a/contrib/citext/citext.control

+++ b/contrib/citext/citext.control

# citext extension

comment = 'data type for case-insensitive character strings'

-default_version = '1.3'

+default_version = '1.4'

module_pathname = '$libdir/citext'

relocatable = true

diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out

index 6541b24b5f80bd6e412a56c08d63ff5d1ba6a0ae..1a1e6c82f77cd8982302d0e2efde29683eb5205b 100644 (file)

--- a/contrib/citext/expected/citext.out

+++ b/contrib/citext/expected/citext.out

t

(4 rows)

+SELECT regexp_match('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)', '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz', '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+-- c forces case-sensitive

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no result";

+ no result

+-----------

+

+(1 row)

+

+-- g is not allowed

+SELECT regexp_match('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g') AS "error";

+ERROR: regexp_match does not support the global option

+HINT: Use the regexp_matches function instead.

+CONTEXT: SQL function "regexp_match" statement 1

SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

t

---

diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out

index 462d42a3bd822b2b4625ab1d8b1e9f1de09bd6bf..3331dbc2553c64c80f1c62567d6ffd5e1e0d896c 100644 (file)

--- a/contrib/citext/expected/citext_1.out

+++ b/contrib/citext/expected/citext_1.out

t

(4 rows)

+SELECT regexp_match('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)', '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz', '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+ t

+---

+ t

+(1 row)

+

+-- c forces case-sensitive

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no result";

+ no result

+-----------

+

+(1 row)

+

+-- g is not allowed

+SELECT regexp_match('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g') AS "error";

+ERROR: regexp_match does not support the global option

+HINT: Use the regexp_matches function instead.

+CONTEXT: SQL function "regexp_match" statement 1

SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

t

---

diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql

index 2df1b4aaf0970f80c8cc68b5d79a4a9515584861..a8024846635ca76a9292b77db3a3a6ad09d519a2 100644 (file)

--- a/contrib/citext/sql/citext.sql

+++ b/contrib/citext/sql/citext.sql

SELECT quote_ident( name ) = quote_ident( name::text ) AS t FROM srt;

SELECT quote_literal( name ) = quote_literal( name::text ) AS t FROM srt;

+SELECT regexp_match('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)') = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)', '') = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz', '(BAR)(BEQUE)'::citext, '') = ARRAY[ 'bar', 'beque' ] AS t;

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, ''::citext) = ARRAY[ 'bar', 'beque' ] AS t;

+-- c forces case-sensitive

+SELECT regexp_match('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext, 'c'::citext) = ARRAY[ 'bar', 'beque' ] AS "no result";

+-- g is not allowed

+SELECT regexp_match('foobarbequebazmorebarbequetoo'::citext, '(BAR)(BEQUE)'::citext, 'g') AS "error";

+

SELECT regexp_matches('foobarbequebaz'::citext, '(bar)(beque)') = ARRAY[ 'bar', 'beque' ] AS t;

SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)') = ARRAY[ 'bar', 'beque' ] AS t;

SELECT regexp_matches('foobarbequebaz'::citext, '(BAR)(BEQUE)'::citext) = ARRAY[ 'bar', 'beque' ] AS t;

diff --git a/doc/src/sgml/citext.sgml b/doc/src/sgml/citext.sgml

index 7fdf30252a5877f4293959e24a88ba23db64617e..9b4c68f7d4775b10274d6f6219853d6e4b39ceb3 100644 (file)

--- a/doc/src/sgml/citext.sgml

+++ b/doc/src/sgml/citext.sgml

</para>

<itemizedlist>

+ <listitem>

+ <para>

+ <function>regexp_match()</>

+ </para>

+ </listitem>

<listitem>

<para>

<function>regexp_matches()</>