Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite7bfc7e

Browse files
committed
Fix some uses of "the quick brown fox".
If we're going to quote a well-known pangram, we should quote itaccurately. Per gripe from Thom Brown.
1 parentb142068 commite7bfc7e

File tree

3 files changed

+75
-78
lines changed

3 files changed

+75
-78
lines changed

‎doc/src/sgml/func.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4048,24 +4048,24 @@ SELECT col1, (SELECT regexp_matches(col2, '(bar)(beque)')) FROM tab;
40484048
Some examples:
40494049
<programlisting>
40504050

4051-
SELECT foo FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', E'\\s+') AS foo;
4051+
SELECT foo FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', E'\\s+') AS foo;
40524052
foo
4053-
--------
4053+
-------
40544054
the
40554055
quick
40564056
brown
40574057
fox
4058-
jumped
4058+
jumps
40594059
over
40604060
the
40614061
lazy
40624062
dog
40634063
(9 rows)
40644064

4065-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', E'\\s+');
4065+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', E'\\s+');
40664066
regexp_split_to_array
4067-
------------------------------------------------
4068-
{the,quick,brown,fox,jumped,over,the,lazy,dog}
4067+
-----------------------------------------------
4068+
{the,quick,brown,fox,jumps,over,the,lazy,dog}
40694069
(1 row)
40704070

40714071
SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;

‎src/test/regress/expected/strings.out

Lines changed: 55 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -448,27 +448,27 @@ ERROR: invalid regular expression: parentheses () not balanced
448448
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
449449
ERROR: invalid regular expression: invalid repetition count(s)
450450
-- split string on regexp
451-
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', $re$\s+$re$) AS foo;
452-
foo| length
453-
--------+--------
454-
the| 3
455-
quick| 5
456-
brown| 5
457-
fox| 3
458-
jumped |6
459-
over| 4
460-
the| 3
461-
lazy| 4
462-
dog| 3
451+
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', $re$\s+$re$) AS foo;
452+
foo | length
453+
-------+--------
454+
the | 3
455+
quick | 5
456+
brown | 5
457+
fox | 3
458+
jumps |5
459+
over | 4
460+
the | 3
461+
lazy | 4
462+
dog | 3
463463
(9 rows)
464464

465-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', $re$\s+$re$);
466-
regexp_split_to_array
467-
------------------------------------------------
468-
{the,quick,brown,fox,jumped,over,the,lazy,dog}
465+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', $re$\s+$re$);
466+
regexp_split_to_array
467+
-----------------------------------------------
468+
{the,quick,brown,fox,jumps,over,the,lazy,dog}
469469
(1 row)
470470

471-
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', $re$\s*$re$) AS foo;
471+
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', $re$\s*$re$) AS foo;
472472
foo | length
473473
-----+--------
474474
t | 1
@@ -491,8 +491,7 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
491491
u | 1
492492
m | 1
493493
p | 1
494-
e | 1
495-
d | 1
494+
s | 1
496495
o | 1
497496
v | 1
498497
e | 1
@@ -507,15 +506,15 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
507506
d | 1
508507
o | 1
509508
g | 1
510-
(36 rows)
509+
(35 rows)
511510

512-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', $re$\s*$re$);
513-
regexp_split_to_array
514-
---------------------------------------------------------------------------
515-
{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}
511+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', $re$\s*$re$);
512+
regexp_split_to_array
513+
-------------------------------------------------------------------------
514+
{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}
516515
(1 row)
517516

518-
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', '') AS foo;
517+
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', '') AS foo;
519518
foo | length
520519
-----+--------
521520
t | 1
@@ -542,8 +541,7 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
542541
u | 1
543542
m | 1
544543
p | 1
545-
e | 1
546-
d | 1
544+
s | 1
547545
| 1
548546
o | 1
549547
v | 1
@@ -562,42 +560,41 @@ SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown fox jumped o
562560
d | 1
563561
o | 1
564562
g | 1
565-
(44 rows)
563+
(43 rows)
566564

567-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', '');
568-
regexp_split_to_array
569-
-----------------------------------------------------------------------------------------------------------
570-
{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}
565+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', '');
566+
regexp_split_to_array
567+
---------------------------------------------------------------------------------------------------------
568+
{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}
571569
(1 row)
572570

573571
-- case insensitive
574-
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i') AS foo;
575-
foo | length
576-
-----------------------+--------
577-
th | 2
578-
QUick bROWn FOx jUMP | 21
579-
d ov | 4
580-
r TH | 4
581-
lazy dOG | 9
582-
(5 rows)
583-
584-
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPed ovEr THE lazy dOG', 'e', 'i');
585-
regexp_split_to_array
586-
--------------------------------------------------------
587-
{th," QUick bROWn FOx jUMP","d ov","r TH"," lazy dOG"}
572+
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i') AS foo;
573+
foo | length
574+
---------------------------+--------
575+
th | 2
576+
QUick bROWn FOx jUMPs ov | 25
577+
r Th | 4
578+
lazy dOG | 9
579+
(4 rows)
580+
581+
SELECT regexp_split_to_array('thE QUick bROWn FOx jUMPs ovEr The lazy dOG', 'e', 'i');
582+
regexp_split_to_array
583+
-----------------------------------------------------
584+
{th," QUick bROWn FOx jUMPs ov","r Th"," lazy dOG"}
588585
(1 row)
589586

590587
-- no match of pattern
591-
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', 'nomatch') AS foo;
592-
foo| length
593-
----------------------------------------------+--------
594-
the quick brown foxjumped over the lazy dog |44
588+
SELECT foo, length(foo) FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', 'nomatch') AS foo;
589+
foo | length
590+
---------------------------------------------+--------
591+
the quick brown foxjumps over the lazy dog |43
595592
(1 row)
596593

597-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', 'nomatch');
598-
regexp_split_to_array
599-
--------------------------------------------------
600-
{"the quick brown foxjumped over the lazy dog"}
594+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', 'nomatch');
595+
regexp_split_to_array
596+
-------------------------------------------------
597+
{"the quick brown foxjumps over the lazy dog"}
601598
(1 row)
602599

603600
-- some corner cases
@@ -620,14 +617,14 @@ SELECT regexp_split_to_array('123456','.');
620617
(1 row)
621618

622619
-- errors
623-
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG', 'e', 'zippy') AS foo;
620+
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOxjUMPs ovErThe lazy dOG', 'e', 'zippy') AS foo;
624621
ERROR: invalid regexp option: "z"
625-
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG', 'e', 'iz');
622+
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPs ovErThe lazy dOG', 'e', 'iz');
626623
ERROR: invalid regexp option: "z"
627624
-- global option meaningless for regexp_split
628-
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG', 'e', 'g') AS foo;
625+
SELECT foo, length(foo) FROM regexp_split_to_table('thE QUick bROWn FOxjUMPs ovErThe lazy dOG', 'e', 'g') AS foo;
629626
ERROR: regexp_split does not support the global option
630-
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG', 'e', 'g');
627+
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPs ovErThe lazy dOG', 'e', 'g');
631628
ERROR: regexp_split does not support the global option
632629
-- change NULL-display back
633630
\pset null ''

‎src/test/regress/sql/strings.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -164,29 +164,29 @@ SELECT regexp_matches('foobarbequebaz', $re$(barbeque$re$);
164164
SELECT regexp_matches('foobarbequebaz', $re$(bar)(beque){2,1}$re$);
165165

166166
-- split string on regexp
167-
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', $re$\s+$re$)AS foo;
168-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', $re$\s+$re$);
167+
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', $re$\s+$re$)AS foo;
168+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', $re$\s+$re$);
169169

170-
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog', $re$\s*$re$)AS foo;
171-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog', $re$\s*$re$);
172-
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog','')AS foo;
173-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog','');
170+
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog', $re$\s*$re$)AS foo;
171+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog', $re$\s*$re$);
172+
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog','')AS foo;
173+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog','');
174174
-- case insensitive
175-
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','i')AS foo;
176-
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','i');
175+
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','i')AS foo;
176+
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','i');
177177
-- no match of pattern
178-
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumped over the lazy dog','nomatch')AS foo;
179-
SELECT regexp_split_to_array('the quick brown foxjumped over the lazy dog','nomatch');
178+
SELECT foo, length(foo)FROM regexp_split_to_table('the quick brown foxjumps over the lazy dog','nomatch')AS foo;
179+
SELECT regexp_split_to_array('the quick brown foxjumps over the lazy dog','nomatch');
180180
-- some corner cases
181181
SELECT regexp_split_to_array('123456','1');
182182
SELECT regexp_split_to_array('123456','6');
183183
SELECT regexp_split_to_array('123456','.');
184184
-- errors
185-
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','zippy')AS foo;
186-
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','iz');
185+
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','zippy')AS foo;
186+
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','iz');
187187
-- global option meaningless for regexp_split
188-
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','g')AS foo;
189-
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPed ovErTHE lazy dOG','e','g');
188+
SELECT foo, length(foo)FROM regexp_split_to_table('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','g')AS foo;
189+
SELECT regexp_split_to_array('thE QUick bROWn FOxjUMPs ovErThe lazy dOG','e','g');
190190

191191
-- change NULL-display back
192192
\psetnull''

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp