rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some uses of "the quick brown fox". 

If we're going to quote a well-known pangram, we should quote it
accurately.  Per gripe from Thom Brown.
This commit is contained in:
Tom Lane 2013-05-16 12:30:41 -04:00
parent b142068622
commit e7bfc7e42c
3 changed files with 74 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/func.sgml
View File

@ -4048,24 +4048,24 @@ SELECT col1, (SELECT regexp_matches(col2, '(bar)(beque)')) FROM tab;
Some examples: Some examples:
<programlisting> <programlisting>
SELECT foo FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', E'\\s+') AS foo; SELECT foo FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', E'\\s+') AS foo;
foo foo
-------- -------
the the
quick quick
brown brown
fox fox
jumped jumps
over over
the the
lazy lazy
dog dog
(9 rows) (9 rows)
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', E'\\s+'); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', E'\\s+');
regexp_split_to_array regexp_split_to_array
------------------------------------------------ -----------------------------------------------
{the,quick,brown,fox,jumped,over,the,lazy,dog} {the,quick,brown,fox,jumps,over,the,lazy,dog}
(1 row) (1 row)
SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo; SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;

111
src/test/regress/expected/strings.out
View File

@ -448,27 +448,27 @@ ERROR: invalid regular expression: parentheses () not balanced
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$); SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
ERROR: invalid regular expression: invalid repetition count(s) ERROR: invalid regular expression: invalid repetition count(s)
-- split string on regexp -- split string on regexp
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', $re$\s+$re$) AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', $re$\s+$re$) AS foo;
foo | length foo | length
--------+-------- -------+--------
the | 3 the | 3
quick | 5 quick | 5
brown | 5 brown | 5
fox | 3 fox | 3
jumped | 6 jumps | 5
over | 4 over | 4
the | 3 the | 3
lazy | 4 lazy | 4
dog | 3 dog | 3
(9 rows) (9 rows)
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', $re$\s+$re$); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', $re$\s+$re$);
regexp_split_to_array regexp_split_to_array
------------------------------------------------ -----------------------------------------------
{the,quick,brown,fox,jumped,over,the,lazy,dog} {the,quick,brown,fox,jumps,over,the,lazy,dog}
(1 row) (1 row)
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', $re$\s*$re$) AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', $re$\s*$re$) AS foo;
foo | length foo | length
-----+-------- -----+--------
t | 1 t | 1
@ -491,8 +491,7 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
u | 1 u | 1
m | 1 m | 1
p | 1 p | 1
e | 1 s | 1
d | 1
o | 1 o | 1
v | 1 v | 1
e | 1 e | 1
@ -507,15 +506,15 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
d | 1 d | 1
o | 1 o | 1
g | 1 g | 1
(36 rows) (35 rows)
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', $re$\s*$re$); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', $re$\s*$re$);
regexp_split_to_array regexp_split_to_array
--------------------------------------------------------------------------- -------------------------------------------------------------------------
{t,h,e,q,u,i,c,k,b,r,o,w,n,f,o,x,j,u,m,p,e,d,o,v,e,r,t,h,e,l,a,z,y,d,o,g} {t,h,e,q,u,i,c,k,b,r,o,w,n,f,o,x,j,u,m,p,s,o,v,e,r,t,h,e,l,a,z,y,d,o,g}
(1 row) (1 row)
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', '') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', '') AS foo;
foo | length foo | length
-----+-------- -----+--------
t | 1 t | 1
@ -542,8 +541,7 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
u | 1 u | 1
m | 1 m | 1
p | 1 p | 1
e | 1 s | 1
d | 1
| 1 | 1
o | 1 o | 1
v | 1 v | 1
@ -562,42 +560,41 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
d | 1 d | 1
o | 1 o | 1
g | 1 g | 1
(44 rows) (43 rows)
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', ''); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', '');
regexp_split_to_array regexp_split_to_array
----------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------
{t,h,e," ",q,u,i,c,k," ",b,r,o,w,n," ",f,o,x," ",j,u,m,p,e,d," ",o,v,e,r," ",t,h,e," ",l,a,z,y," ",d,o,g} {t,h,e," ",q,u,i,c,k," ",b,r,o,w,n," ",f,o,x," ",j,u,m,p,s," ",o,v,e,r," ",t,h,e," ",l,a,z,y," ",d,o,g}
(1 row) (1 row)
-- case insensitive -- case insensitive
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i') AS foo;
foo | length foo | length
-----------------------+-------- ---------------------------+--------
th | 2 th | 2
QUick bROWn FOx jUMP | 21 QUick bROWn FOx jUMPs ov | 25
d ov | 4 r Th | 4
r TH | 4 lazy dOG | 9
lazy dOG | 9 (4 rows)
(5 rows)
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i');
regexp_split_to_array regexp_split_to_array
-------------------------------------------------------- -----------------------------------------------------
{th," QUick bROWn FOx jUMP","d ov","r TH"," lazy dOG"} {th," QUick bROWn FOx jUMPs ov","r Th"," lazy dOG"}
(1 row) (1 row)
-- no match of pattern -- no match of pattern
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', 'nomatch') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', 'nomatch') AS foo;
foo | length foo | length
----------------------------------------------+-------- ---------------------------------------------+--------
the quick brown fox jumped over the lazy dog | 44 the quick brown fox jumps over the lazy dog | 43
(1 row) (1 row)
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', 'nomatch'); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', 'nomatch');
regexp_split_to_array regexp_split_to_array
-------------------------------------------------- -------------------------------------------------
{"the quick brown fox jumped over the lazy dog"} {"the quick brown fox jumps over the lazy dog"}
(1 row) (1 row)
-- some corner cases -- some corner cases
@ -620,14 +617,14 @@ SELECT regexp_split_to_array('123456','.');
(1 row) (1 row)
-- errors -- errors
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'zippy') AS foo;
ERROR: invalid regexp option: "z" ERROR: invalid regexp option: "z"
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'iz'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'iz');
ERROR: invalid regexp option: "z" ERROR: invalid regexp option: "z"
-- global option meaningless for regexp_split -- global option meaningless for regexp_split
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g') AS foo;
ERROR: regexp_split does not support the global option ERROR: regexp_split does not support the global option
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g');
ERROR: regexp_split does not support the global option ERROR: regexp_split does not support the global option
-- change NULL-display back -- change NULL-display back
\pset null '' \pset null ''

28
src/test/regress/sql/strings.sql
View File

@ -164,29 +164,29 @@ SELECT regexp_matches('foobarbequebaz', $re$(barbeque$re$);
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$); SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
-- split string on regexp -- split string on regexp
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', $re$\s+$re$) AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', $re$\s+$re$) AS foo;
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', $re$\s+$re$); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', $re$\s+$re$);
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', $re$\s*$re$) AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', $re$\s*$re$) AS foo;
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', $re$\s*$re$); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', $re$\s*$re$);
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', '') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', '') AS foo;
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', ''); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', '');
-- case insensitive -- case insensitive
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i') AS foo;
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i');
-- no match of pattern -- no match of pattern
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped over the lazy dog', 'nomatch') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', 'nomatch') AS foo;
SELECT regexp_split_to_array('the quick brown fox jumped over the lazy dog', 'nomatch'); SELECT regexp_split_to_array('the quick brown fox jumps over the lazy dog', 'nomatch');
-- some corner cases -- some corner cases
SELECT regexp_split_to_array('123456','1'); SELECT regexp_split_to_array('123456','1');
SELECT regexp_split_to_array('123456','6'); SELECT regexp_split_to_array('123456','6');
SELECT regexp_split_to_array('123456','.'); SELECT regexp_split_to_array('123456','.');
-- errors -- errors
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'zippy') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'zippy') AS foo;
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'iz'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'iz');
-- global option meaningless for regexp_split -- global option meaningless for regexp_split
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g') AS foo; SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g') AS foo;
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'g'); SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'g');
-- change NULL-display back -- change NULL-display back
\pset null '' \pset null ''