database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-18 17:41:14 +03:00
Code

Repair two TIME WITH TIME ZONE bugs found by Dennis Vshivkov. Comparison

Browse Source 
of timetz values misbehaved in --enable-integer-datetime cases, and
EXTRACT(EPOCH) subtracted the zone instead of adding it in all cases.
Backpatch to all supported releases (except --enable-integer-datetime code
does not exist in 7.2).
This commit is contained in:
Tom Lane 2005-04-23 22:53:44 +00:00
parent c7b94bbad9
commit 3b15457092
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/utils/adt/date.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93.2.1 2004/06/13 17:17:48 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.93.2.2 2005/04/23 22:53:44 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1557,12 +1557,20 @@ timetz_scale(PG_FUNCTION_ARGS)
static int static int
timetz_cmp_internal(TimeTzADT *time1, TimeTzADT *time2) timetz_cmp_internal(TimeTzADT *time1, TimeTzADT *time2)
{ {
/* Primary sort is by true (GMT-equivalent) time */
#ifdef HAVE_INT64_TIMESTAMP
int64 t1,
t2;
t1 = time1->time + (time1->zone * INT64CONST(1000000));
t2 = time2->time + (time2->zone * INT64CONST(1000000));
#else
double t1, double t1,
t2; t2;
/* Primary sort is by true (GMT-equivalent) time */
t1 = time1->time + time1->zone; t1 = time1->time + time1->zone;
t2 = time2->time + time2->zone; t2 = time2->time + time2->zone;
#endif
if (t1 > t2) if (t1 > t2)
return 1; return 1;
@ -2143,9 +2151,9 @@ timetz_part(PG_FUNCTION_ARGS)
else if ((type == RESERV) && (val == DTK_EPOCH)) else if ((type == RESERV) && (val == DTK_EPOCH))
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((time->time / 1000000e0) - time->zone); result = ((time->time / 1000000e0) + time->zone);
#else #else
result = (time->time - time->zone); result = (time->time + time->zone);
#endif #endif
} }
else else