NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitd1031cd

committed

Adjust date/time input parsing code to correctly distinguish the four

SQLSTATE error codes required by SQL99 (invalid format, datetime fieldoverflow, interval field overflow, invalid time zone displacement value).Also emit a HINT about DateStyle in cases where it seems appropriate.Per recent gripes.

1 parent3722226 commitd1031cdCopy full SHA for d1031cd

File tree

13 files changed

+465

-307

lines changed

src
- backend/utils/adt
- include/utils
  - datetime.h
- test/regress/expected

13 files changed

+465

-307

lines changed

`‎src/backend/utils/adt/date.c‎`

Lines changed: 27 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.90 2003/08/08 00:10:31 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.91 2003/08/27 23:29:27 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -62,20 +62,19 @@ date_in(PG_FUNCTION_ARGS)`
`62`	`62`	`inttzp;`
`63`	`63`	`intdtype;`
`64`	`64`	`intnf;`
	`65`	`+intdterr;`
`65`	`66`	`char*field[MAXDATEFIELDS];`
`66`	`67`	`intftype[MAXDATEFIELDS];`
`67`	`68`	`charlowstr[MAXDATELEN+1];`
`68`	`69`
`69`	`70`	`if (strlen(str) >=sizeof(lowstr))`
`70`		`-ereport(ERROR,`
`71`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`72`		`-errmsg("invalid input syntax for date: \"%s\"",str)));`
`73`		`-`
`74`		`-if ((ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf)!=0)`
`75`		`-\|\| (DecodeDateTime(field,ftype,nf,&dtype,tm,&fsec,&tzp)!=0))`
`76`		`-ereport(ERROR,`
`77`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`78`		`-errmsg("invalid input syntax for date: \"%s\"",str)));`
	`71`	`+dterr=DTERR_BAD_FORMAT;`
	`72`	`+else`
	`73`	`+dterr=ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf);`
	`74`	`+if (dterr==0)`
	`75`	`+dterr=DecodeDateTime(field,ftype,nf,&dtype,tm,&fsec,&tzp);`
	`76`	`+if (dterr!=0)`
	`77`	`+DateTimeParseError(dterr,str,"date");`
`79`	`78`
`80`	`79`	`switch (dtype)`
`81`	`80`	`{`
`@@ -95,9 +94,8 @@ date_in(PG_FUNCTION_ARGS)`
`95`	`94`	`break;`
`96`	`95`
`97`	`96`	`default:`
`98`		`-ereport(ERROR,`
`99`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`100`		`-errmsg("invalid input syntax for date: \"%s\"",str)));`
	`97`	`+DateTimeParseError(DTERR_BAD_FORMAT,str,"date");`
	`98`	`+break;`
`101`	`99`	`}`
`102`	`100`
`103`	`101`	`date=date2j(tm->tm_year,tm->tm_mon,tm->tm_mday)-POSTGRES_EPOCH_JDATE;`
`@@ -559,21 +557,20 @@ time_in(PG_FUNCTION_ARGS)`
`559`	`557`	`*tm=&tt;`
`560`	`558`	`inttz;`
`561`	`559`	`intnf;`
	`560`	`+intdterr;`
`562`	`561`	`charlowstr[MAXDATELEN+1];`
`563`	`562`	`char*field[MAXDATEFIELDS];`
`564`	`563`	`intdtype;`
`565`	`564`	`intftype[MAXDATEFIELDS];`
`566`	`565`
`567`	`566`	`if (strlen(str) >=sizeof(lowstr))`
`568`		`-ereport(ERROR,`
`569`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`570`		`-errmsg("invalid input syntax for time: \"%s\"",str)));`
`571`		`-`
`572`		`-if ((ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf)!=0)`
`573`		`-\|\| (DecodeTimeOnly(field,ftype,nf,&dtype,tm,&fsec,&tz)!=0))`
`574`		`-ereport(ERROR,`
`575`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`576`		`-errmsg("invalid input syntax for time: \"%s\"",str)));`
	`567`	`+dterr=DTERR_BAD_FORMAT;`
	`568`	`+else`
	`569`	`+dterr=ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf);`
	`570`	`+if (dterr==0)`
	`571`	`+dterr=DecodeTimeOnly(field,ftype,nf,&dtype,tm,&fsec,&tz);`
	`572`	`+if (dterr!=0)`
	`573`	`+DateTimeParseError(dterr,str,"time");`
`577`	`574`
`578`	`575`	`tm2time(tm,fsec,&result);`
`579`	`576`	`AdjustTimeForTypmod(&result,typmod);`
`@@ -1424,23 +1421,20 @@ timetz_in(PG_FUNCTION_ARGS)`
`1424`	`1421`	`*tm=&tt;`
`1425`	`1422`	`inttz;`
`1426`	`1423`	`intnf;`
	`1424`	`+intdterr;`
`1427`	`1425`	`charlowstr[MAXDATELEN+1];`
`1428`	`1426`	`char*field[MAXDATEFIELDS];`
`1429`	`1427`	`intdtype;`
`1430`	`1428`	`intftype[MAXDATEFIELDS];`
`1431`	`1429`
`1432`	`1430`	`if (strlen(str) >=sizeof(lowstr))`
`1433`		`-ereport(ERROR,`
`1434`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`1435`		`-errmsg("invalid input syntax for time with time zone: \"%s\"",`
`1436`		`-str)));`
`1437`		`-`
`1438`		`-if ((ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf)!=0)`
`1439`		`-\|\| (DecodeTimeOnly(field,ftype,nf,&dtype,tm,&fsec,&tz)!=0))`
`1440`		`-ereport(ERROR,`
`1441`		`-(errcode(ERRCODE_INVALID_DATETIME_FORMAT),`
`1442`		`-errmsg("invalid input syntax for time with time zone: \"%s\"",`
`1443`		`-str)));`
	`1431`	`+dterr=DTERR_BAD_FORMAT;`
	`1432`	`+else`
	`1433`	`+dterr=ParseDateTime(str,lowstr,field,ftype,MAXDATEFIELDS,&nf);`
	`1434`	`+if (dterr==0)`
	`1435`	`+dterr=DecodeTimeOnly(field,ftype,nf,&dtype,tm,&fsec,&tz);`
	`1436`	`+if (dterr!=0)`
	`1437`	`+DateTimeParseError(dterr,str,"time with time zone");`
`1444`	`1438`
`1445`	`1439`	`result= (TimeTzADT*)palloc(sizeof(TimeTzADT));`
`1446`	`1440`	`tm2timetz(tm,fsec,tz,result);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd1031cd

File tree

13 files changed

13 files changed

`‎src/backend/utils/adt/date.c‎`

0 commit comments