NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitb3b89fd

committed

Fix DecodeInterval to report an error for multiple occurrences of DAY, WEEK,

YEAR, DECADE, CENTURY, or MILLENIUM fields, just as it always has done forother types of fields. The previous behavior seems to have been a hack toavoid defining bit-positions for all these field types in DTK_M() masks,rather than something that was really considered to be desired behavior.But there is room in the masks for these, and we really need to tighten upat least the behavior of DAY and YEAR fields to avoid unexpected behaviorassociated with the 8.4 changes to interpret ambiguous fields based on theinterval qualifier (typmod) value. Per my example and proposed patch.

1 parent5377ccb commitb3b89fdCopy full SHA for b3b89fd

File tree

2 files changed

+14

-9

lines changed

src
- backend/utils/adt
  - datetime.c
- include/utils
  - datetime.h

2 files changed

+14

-9

lines changed

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

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.205 2009/05/26 02:17:50 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.206 2009/06/01 16:55:11 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3022,19 +3022,19 @@ DecodeInterval(char *field, int ftype, int nf, int range,`
`3022`	`3022`	`tm->tm_hour+=val;`
`3023`	`3023`	`AdjustFractSeconds(fval,tm,fsec,SECS_PER_HOUR);`
`3024`	`3024`	`tmask=DTK_M(HOUR);`
`3025`		`-type=DTK_DAY;`
	`3025`	`+type=DTK_DAY;/* set for next field */`
`3026`	`3026`	`break;`
`3027`	`3027`
`3028`	`3028`	`caseDTK_DAY:`
`3029`	`3029`	`tm->tm_mday+=val;`
`3030`	`3030`	`AdjustFractSeconds(fval,tm,fsec,SECS_PER_DAY);`
`3031`		`-tmask=(fmask&DTK_M(DAY)) ?0 :DTK_M(DAY);`
	`3031`	`+tmask=DTK_M(DAY);`
`3032`	`3032`	`break;`
`3033`	`3033`
`3034`	`3034`	`caseDTK_WEEK:`
`3035`	`3035`	`tm->tm_mday+=val*7;`
`3036`	`3036`	`AdjustFractDays(fval,tm,fsec,7);`
`3037`		`-tmask=(fmask&DTK_M(DAY)) ?0 :DTK_M(DAY);`
	`3037`	`+tmask=DTK_M(WEEK);`
`3038`	`3038`	`break;`
`3039`	`3039`
`3040`	`3040`	`caseDTK_MONTH:`
`@@ -3047,28 +3047,28 @@ DecodeInterval(char *field, int ftype, int nf, int range,`
`3047`	`3047`	`tm->tm_year+=val;`
`3048`	`3048`	`if (fval!=0)`
`3049`	`3049`	`tm->tm_mon+=fval*MONTHS_PER_YEAR;`
`3050`		`-tmask=(fmask&DTK_M(YEAR)) ?0 :DTK_M(YEAR);`
	`3050`	`+tmask=DTK_M(YEAR);`
`3051`	`3051`	`break;`
`3052`	`3052`
`3053`	`3053`	`caseDTK_DECADE:`
`3054`	`3054`	`tm->tm_year+=val*10;`
`3055`	`3055`	`if (fval!=0)`
`3056`	`3056`	`tm->tm_mon+=fvalMONTHS_PER_YEAR10;`
`3057`		`-tmask=(fmask&DTK_M(YEAR)) ?0 :DTK_M(YEAR);`
	`3057`	`+tmask=DTK_M(DECADE);`
`3058`	`3058`	`break;`
`3059`	`3059`
`3060`	`3060`	`caseDTK_CENTURY:`
`3061`	`3061`	`tm->tm_year+=val*100;`
`3062`	`3062`	`if (fval!=0)`
`3063`	`3063`	`tm->tm_mon+=fvalMONTHS_PER_YEAR100;`
`3064`		`-tmask=(fmask&DTK_M(YEAR)) ?0 :DTK_M(YEAR);`
	`3064`	`+tmask=DTK_M(CENTURY);`
`3065`	`3065`	`break;`
`3066`	`3066`
`3067`	`3067`	`caseDTK_MILLENNIUM:`
`3068`	`3068`	`tm->tm_year+=val*1000;`
`3069`	`3069`	`if (fval!=0)`
`3070`	`3070`	`tm->tm_mon+=fvalMONTHS_PER_YEAR1000;`
`3071`		`-tmask=(fmask&DTK_M(YEAR)) ?0 :DTK_M(YEAR);`
	`3071`	`+tmask=DTK_M(MILLENNIUM);`
`3072`	`3072`	`break;`
`3073`	`3073`
`3074`	`3074`	`default:`

`‎src/include/utils/datetime.h`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`10`	`10`	`* Portions Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`		`- * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.73 2009/05/26 02:17:50 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.74 2009/06/01 16:55:11 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -114,6 +114,11 @@`
`114`	`114`	`/* generic fields to help with parsing */`
`115`	`115`	`#defineISODATE 22`
`116`	`116`	`#defineISOTIME 23`
	`117`	`+/* these are only for parsing intervals */`
	`118`	`+#defineWEEK24`
	`119`	`+#defineDECADE25`
	`120`	`+#defineCENTURY26`
	`121`	`+#defineMILLENNIUM27`
`117`	`122`	`/* reserved for unrecognized string values */`
`118`	`123`	`#defineUNKNOWN_FIELD31`
`119`	`124`

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!

Commitb3b89fd

File tree

2 files changed

2 files changed

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

`‎src/include/utils/datetime.h`

0 commit comments