diff options
| author | Peter Eisentraut | 2020-06-29 09:04:42 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2020-06-29 09:05:00 +0000 |
| commit | 78c887679d7632c1211f85eb95723f3226bf1b46 (patch) | |
| tree | 7c333d0f5f4c6238ea74bc44038564a179882107 /contrib | |
| parent | aafefb4dcbf79e8cb1439e888a9cdb3dfefa7657 (diff) | |
Add current substring regular expression syntax
SQL:1999 had syntax
SUBSTRING(text FROM pattern FOR escapechar)
but this was replaced in SQL:2003 by the more clear
SUBSTRING(text SIMILAR pattern ESCAPE escapechar)
but this was never implemented in PostgreSQL. This patch adds that
new syntax as an alternative in the parser, and updates documentation
and tests to indicate that this is the preferred alternative now.
Reviewed-by: Pavel Stehule <pavel.stehule@gmail.com>
Reviewed-by: Vik Fearing <vik@postgresfriends.org>
Reviewed-by: Fabien COELHO <coelho@cri.ensmp.fr>
Discussion: https://www.postgresql.org/message-id/flat/a15db31c-d0f8-8ce0-9039-578a31758adb%402ndquadrant.com
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/citext/expected/citext.out | 2 | ||||
| -rw-r--r-- | contrib/citext/expected/citext_1.out | 2 | ||||
| -rw-r--r-- | contrib/citext/sql/citext.sql | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 96800be9c03..ec99aaed5dc 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -1602,7 +1602,7 @@ SELECT substring('Thomas'::citext from '...$') = 'mas' AS t; t (1 row) -SELECT substring('Thomas'::citext from '%#"o_a#"_' for '#') = 'oma' AS t; +SELECT substring('Thomas'::citext similar '%#"o_a#"_' escape '#') = 'oma' AS t; t --- t diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index 33e3676d3c4..75fd08b7cc4 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -1602,7 +1602,7 @@ SELECT substring('Thomas'::citext from '...$') = 'mas' AS t; t (1 row) -SELECT substring('Thomas'::citext from '%#"o_a#"_' for '#') = 'oma' AS t; +SELECT substring('Thomas'::citext similar '%#"o_a#"_' escape '#') = 'oma' AS t; t --- t diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 261b73cfa6c..10232f5a9f4 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -564,7 +564,7 @@ SELECT substring('alphabet'::citext, 3, 2) = 'ph' AS t; SELECT substring('Thomas'::citext from 2 for 3) = 'hom' AS t; SELECT substring('Thomas'::citext from 2) = 'homas' AS t; SELECT substring('Thomas'::citext from '...$') = 'mas' AS t; -SELECT substring('Thomas'::citext from '%#"o_a#"_' for '#') = 'oma' AS t; +SELECT substring('Thomas'::citext similar '%#"o_a#"_' escape '#') = 'oma' AS t; SELECT trim(' trim '::citext) = 'trim' AS t; SELECT trim('xxxxxtrimxxxx'::citext, 'x'::citext) = 'trim' AS t; |