mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in interval-to-time conversion: HAVE_INT64_TIMESTAMP case did not

Browse Source 
work at all, and neither case behaved sanely for negative intervals.
This commit is contained in:
Tom Lane 2003-06-16 18:56:45 +00:00
parent 76924b5d94
commit 3467b1a1f9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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.82 2003/05/12 23:08:50 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.83 2003/06/16 18:56:45 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1066,6 +1066,11 @@ time_interval(PG_FUNCTION_ARGS)
/* interval_time() /* interval_time()
* Convert interval to time data type. * Convert interval to time data type.
*
* This is defined as producing the fractional-day portion of the interval.
* Therefore, we can just ignore the months field. It is not real clear
* what to do with negative intervals, but we choose to subtract the floor,
* so that, say, '-2 hours' becomes '22:00:00'.
*/ */
Datum Datum
interval_time(PG_FUNCTION_ARGS) interval_time(PG_FUNCTION_ARGS)
@ -1074,15 +1079,23 @@ interval_time(PG_FUNCTION_ARGS)
TimeADT result; TimeADT result;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = span->time; int64 days;
if ((result >= INT64CONST(86400000000))
|| (result <= INT64CONST(-86400000000)))
result -= (result / INT64CONST(1000000) * INT64CONST(1000000));
#else
Interval span1;
result = span->time; result = span->time;
TMODULO(result, span1.time, 86400e0); if (result >= INT64CONST(86400000000))
{
days = result / INT64CONST(86400000000);
result -= days * INT64CONST(86400000000);
}
else if (result < 0)
{
days = (-result + INT64CONST(86400000000-1)) / INT64CONST(86400000000);
result += days * INT64CONST(86400000000);
}
#else
result = span->time;
if (result >= 86400e0 || result < 0)
result -= floor(result / 86400e0) * 86400e0;
#endif #endif
PG_RETURN_TIMEADT(result); PG_RETURN_TIMEADT(result);