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

Commit2e7c4ab

Browse files
committed
Use camel case for "DateStyle" in some error messages
This GUC is written as camel-case in most of the documentation and theGUC table (but not postgresql.conf.sample), and two error messageshardcoded it with lower case characters. Let's use a style moreconsistent.Most of the noise comes from the regression tests, updated to reflectthe GUC name in these error messages.Author: Peter SmithReviewed-by: Peter Eisentraut, Álvaro HerreraDiscussion:https://postgr.es/m/CAHut+Pv-kSN8SkxSdoHano_wPubqcg5789ejhCDZAcLFceBR-w@mail.gmail.com
1 parentf8d9a9f commit2e7c4ab

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎src/backend/commands/variable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ check_datestyle(char **newval, void **extra, GucSource source)
182182

183183
if (!ok)
184184
{
185-
GUC_check_errdetail("Conflicting \"datestyle\" specifications.");
185+
GUC_check_errdetail("Conflicting \"DateStyle\" specifications.");
186186
return false;
187187
}
188188

‎src/backend/utils/adt/datetime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4107,7 +4107,7 @@ DateTimeParseError(int dterr, DateTimeErrorExtra *extra,
41074107
(errcode(ERRCODE_DATETIME_FIELD_OVERFLOW),
41084108
errmsg("date/time field value out of range: \"%s\"",
41094109
str),
4110-
errhint("Perhaps you need a different \"datestyle\" setting.")));
4110+
errhint("Perhaps you need a different \"DateStyle\" setting.")));
41114111
break;
41124112
caseDTERR_INTERVAL_OVERFLOW:
41134113
errsave(escontext,

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ SELECT date '1/8/1999';
9494
ERROR: date/time field value out of range: "1/8/1999"
9595
LINE 1: SELECT date '1/8/1999';
9696
^
97-
HINT: Perhaps you need a different "datestyle" setting.
97+
HINT: Perhaps you need a different "DateStyle" setting.
9898
SELECT date '1/18/1999';
9999
ERROR: date/time field value out of range: "1/18/1999"
100100
LINE 1: SELECT date '1/18/1999';
101101
^
102-
HINT: Perhaps you need a different "datestyle" setting.
102+
HINT: Perhaps you need a different "DateStyle" setting.
103103
SELECT date '18/1/1999';
104104
ERROR: date/time field value out of range: "18/1/1999"
105105
LINE 1: SELECT date '18/1/1999';
106106
^
107-
HINT: Perhaps you need a different "datestyle" setting.
107+
HINT: Perhaps you need a different "DateStyle" setting.
108108
SELECT date '01/02/03';
109109
date
110110
------------
@@ -139,7 +139,7 @@ SELECT date 'January 8, 99 BC';
139139
ERROR: date/time field value out of range: "January 8, 99 BC"
140140
LINE 1: SELECT date 'January 8, 99 BC';
141141
^
142-
HINT: Perhaps you need a different "datestyle" setting.
142+
HINT: Perhaps you need a different "DateStyle" setting.
143143
SELECT date '99-Jan-08';
144144
date
145145
------------
@@ -156,7 +156,7 @@ SELECT date '08-Jan-99';
156156
ERROR: date/time field value out of range: "08-Jan-99"
157157
LINE 1: SELECT date '08-Jan-99';
158158
^
159-
HINT: Perhaps you need a different "datestyle" setting.
159+
HINT: Perhaps you need a different "DateStyle" setting.
160160
SELECT date '08-Jan-1999';
161161
date
162162
------------
@@ -167,7 +167,7 @@ SELECT date 'Jan-08-99';
167167
ERROR: date/time field value out of range: "Jan-08-99"
168168
LINE 1: SELECT date 'Jan-08-99';
169169
^
170-
HINT: Perhaps you need a different "datestyle" setting.
170+
HINT: Perhaps you need a different "DateStyle" setting.
171171
SELECT date 'Jan-08-1999';
172172
date
173173
------------
@@ -198,7 +198,7 @@ SELECT date '08 Jan 99';
198198
ERROR: date/time field value out of range: "08 Jan 99"
199199
LINE 1: SELECT date '08 Jan 99';
200200
^
201-
HINT: Perhaps you need a different "datestyle" setting.
201+
HINT: Perhaps you need a different "DateStyle" setting.
202202
SELECT date '08 Jan 1999';
203203
date
204204
------------
@@ -209,7 +209,7 @@ SELECT date 'Jan 08 99';
209209
ERROR: date/time field value out of range: "Jan 08 99"
210210
LINE 1: SELECT date 'Jan 08 99';
211211
^
212-
HINT: Perhaps you need a different "datestyle" setting.
212+
HINT: Perhaps you need a different "DateStyle" setting.
213213
SELECT date 'Jan 08 1999';
214214
date
215215
------------
@@ -244,22 +244,22 @@ SELECT date '08-01-99';
244244
ERROR: date/time field value out of range: "08-01-99"
245245
LINE 1: SELECT date '08-01-99';
246246
^
247-
HINT: Perhaps you need a different "datestyle" setting.
247+
HINT: Perhaps you need a different "DateStyle" setting.
248248
SELECT date '08-01-1999';
249249
ERROR: date/time field value out of range: "08-01-1999"
250250
LINE 1: SELECT date '08-01-1999';
251251
^
252-
HINT: Perhaps you need a different "datestyle" setting.
252+
HINT: Perhaps you need a different "DateStyle" setting.
253253
SELECT date '01-08-99';
254254
ERROR: date/time field value out of range: "01-08-99"
255255
LINE 1: SELECT date '01-08-99';
256256
^
257-
HINT: Perhaps you need a different "datestyle" setting.
257+
HINT: Perhaps you need a different "DateStyle" setting.
258258
SELECT date '01-08-1999';
259259
ERROR: date/time field value out of range: "01-08-1999"
260260
LINE 1: SELECT date '01-08-1999';
261261
^
262-
HINT: Perhaps you need a different "datestyle" setting.
262+
HINT: Perhaps you need a different "DateStyle" setting.
263263
SELECT date '99-08-01';
264264
date
265265
------------
@@ -288,22 +288,22 @@ SELECT date '08 01 99';
288288
ERROR: date/time field value out of range: "08 01 99"
289289
LINE 1: SELECT date '08 01 99';
290290
^
291-
HINT: Perhaps you need a different "datestyle" setting.
291+
HINT: Perhaps you need a different "DateStyle" setting.
292292
SELECT date '08 01 1999';
293293
ERROR: date/time field value out of range: "08 01 1999"
294294
LINE 1: SELECT date '08 01 1999';
295295
^
296-
HINT: Perhaps you need a different "datestyle" setting.
296+
HINT: Perhaps you need a different "DateStyle" setting.
297297
SELECT date '01 08 99';
298298
ERROR: date/time field value out of range: "01 08 99"
299299
LINE 1: SELECT date '01 08 99';
300300
^
301-
HINT: Perhaps you need a different "datestyle" setting.
301+
HINT: Perhaps you need a different "DateStyle" setting.
302302
SELECT date '01 08 1999';
303303
ERROR: date/time field value out of range: "01 08 1999"
304304
LINE 1: SELECT date '01 08 1999';
305305
^
306-
HINT: Perhaps you need a different "datestyle" setting.
306+
HINT: Perhaps you need a different "DateStyle" setting.
307307
SELECT date '99 08 01';
308308
date
309309
------------
@@ -345,7 +345,7 @@ SELECT date '1/18/1999';
345345
ERROR: date/time field value out of range: "1/18/1999"
346346
LINE 1: SELECT date '1/18/1999';
347347
^
348-
HINT: Perhaps you need a different "datestyle" setting.
348+
HINT: Perhaps you need a different "DateStyle" setting.
349349
SELECT date '18/1/1999';
350350
date
351351
------------
@@ -392,7 +392,7 @@ SELECT date '99-Jan-08';
392392
ERROR: date/time field value out of range: "99-Jan-08"
393393
LINE 1: SELECT date '99-Jan-08';
394394
^
395-
HINT: Perhaps you need a different "datestyle" setting.
395+
HINT: Perhaps you need a different "DateStyle" setting.
396396
SELECT date '1999-Jan-08';
397397
date
398398
------------
@@ -435,7 +435,7 @@ SELECT date '99 Jan 08';
435435
ERROR: date/time field value out of range: "99 Jan 08"
436436
LINE 1: SELECT date '99 Jan 08';
437437
^
438-
HINT: Perhaps you need a different "datestyle" setting.
438+
HINT: Perhaps you need a different "DateStyle" setting.
439439
SELECT date '1999 Jan 08';
440440
date
441441
------------
@@ -480,7 +480,7 @@ SELECT date '99-01-08';
480480
ERROR: date/time field value out of range: "99-01-08"
481481
LINE 1: SELECT date '99-01-08';
482482
^
483-
HINT: Perhaps you need a different "datestyle" setting.
483+
HINT: Perhaps you need a different "DateStyle" setting.
484484
SELECT date '1999-01-08';
485485
date
486486
------------
@@ -515,7 +515,7 @@ SELECT date '99-08-01';
515515
ERROR: date/time field value out of range: "99-08-01"
516516
LINE 1: SELECT date '99-08-01';
517517
^
518-
HINT: Perhaps you need a different "datestyle" setting.
518+
HINT: Perhaps you need a different "DateStyle" setting.
519519
SELECT date '1999-08-01';
520520
date
521521
------------
@@ -526,7 +526,7 @@ SELECT date '99 01 08';
526526
ERROR: date/time field value out of range: "99 01 08"
527527
LINE 1: SELECT date '99 01 08';
528528
^
529-
HINT: Perhaps you need a different "datestyle" setting.
529+
HINT: Perhaps you need a different "DateStyle" setting.
530530
SELECT date '1999 01 08';
531531
date
532532
------------
@@ -561,7 +561,7 @@ SELECT date '99 08 01';
561561
ERROR: date/time field value out of range: "99 08 01"
562562
LINE 1: SELECT date '99 08 01';
563563
^
564-
HINT: Perhaps you need a different "datestyle" setting.
564+
HINT: Perhaps you need a different "DateStyle" setting.
565565
SELECT date '1999 08 01';
566566
date
567567
------------
@@ -603,7 +603,7 @@ SELECT date '18/1/1999';
603603
ERROR: date/time field value out of range: "18/1/1999"
604604
LINE 1: SELECT date '18/1/1999';
605605
^
606-
HINT: Perhaps you need a different "datestyle" setting.
606+
HINT: Perhaps you need a different "DateStyle" setting.
607607
SELECT date '01/02/03';
608608
date
609609
------------
@@ -644,7 +644,7 @@ SELECT date '99-Jan-08';
644644
ERROR: date/time field value out of range: "99-Jan-08"
645645
LINE 1: SELECT date '99-Jan-08';
646646
^
647-
HINT: Perhaps you need a different "datestyle" setting.
647+
HINT: Perhaps you need a different "DateStyle" setting.
648648
SELECT date '1999-Jan-08';
649649
date
650650
------------
@@ -731,7 +731,7 @@ SELECT date '99-01-08';
731731
ERROR: date/time field value out of range: "99-01-08"
732732
LINE 1: SELECT date '99-01-08';
733733
^
734-
HINT: Perhaps you need a different "datestyle" setting.
734+
HINT: Perhaps you need a different "DateStyle" setting.
735735
SELECT date '1999-01-08';
736736
date
737737
------------
@@ -766,7 +766,7 @@ SELECT date '99-08-01';
766766
ERROR: date/time field value out of range: "99-08-01"
767767
LINE 1: SELECT date '99-08-01';
768768
^
769-
HINT: Perhaps you need a different "datestyle" setting.
769+
HINT: Perhaps you need a different "DateStyle" setting.
770770
SELECT date '1999-08-01';
771771
date
772772
------------
@@ -777,7 +777,7 @@ SELECT date '99 01 08';
777777
ERROR: date/time field value out of range: "99 01 08"
778778
LINE 1: SELECT date '99 01 08';
779779
^
780-
HINT: Perhaps you need a different "datestyle" setting.
780+
HINT: Perhaps you need a different "DateStyle" setting.
781781
SELECT date '1999 01 08';
782782
date
783783
------------
@@ -812,7 +812,7 @@ SELECT date '99 08 01';
812812
ERROR: date/time field value out of range: "99 08 01"
813813
LINE 1: SELECT date '99 08 01';
814814
^
815-
HINT: Perhaps you need a different "datestyle" setting.
815+
HINT: Perhaps you need a different "DateStyle" setting.
816816
SELECT date '1999 08 01';
817817
date
818818
------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
105105
ERROR: date/time field value out of range: "27/12/2001 04:05:06.789-08"
106106
LINE 1: SELECT timestamp with time zone '27/12/2001 04:05:06.789-08'...
107107
^
108-
HINT: Perhaps you need a different "datestyle" setting.
108+
HINT: Perhaps you need a different "DateStyle" setting.
109109
set datestyle to dmy;
110110
SELECT timestamp with time zone '27/12/2001 04:05:06.789-08';
111111
timestamptz

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp