summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/timestamp.c
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>2002-03-05 03:45:44 +0000
committerTatsuo Ishii <ishii@postgresql.org>2002-03-05 03:45:44 +0000
commit06b3be1e48570d7e66c2509412d0192274155766 (patch)
treea8cb8f309473c52981bfbfe2de937a2991385ec1 /src/backend/utils/adt/timestamp.c
parentee93155748ef86dc77d592eff10aefabfe8639d6 (diff)
A backport patch:
Fix bug in extract/date_part for milliseconds/miscroseconds and timestamp/timestamptz combo. Now extract/date_part returns seconds*1000 or 1000000 + fraction part as the manual stats. regression test are also fixed. See the thread in pgsql-hackers: Subject: Re: [HACKERS] timestamp_part() bug? Date: Sat, 02 Mar 2002 11:29:53 +0900
Diffstat (limited to 'src/backend/utils/adt/timestamp.c')
-rw-r--r--src/backend/utils/adt/timestamp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 5c2de69cb29..afd1963f1df 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.62 2002/01/12 04:38:27 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.62.2.1 2002/03/05 03:45:43 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2410,11 +2410,11 @@ timestamp_part(PG_FUNCTION_ARGS)
switch (val)
{
case DTK_MICROSEC:
- result = (fsec * 1000000);
+ result = (tm->tm_sec + fsec) * 1000000;
break;
case DTK_MILLISEC:
- result = (fsec * 1000);
+ result = (tm->tm_sec + fsec) * 1000;
break;
case DTK_SECOND:
@@ -2574,11 +2574,11 @@ timestamptz_part(PG_FUNCTION_ARGS)
break;
case DTK_MICROSEC:
- result = (fsec * 1000000);
+ result = (tm->tm_sec + fsec) * 1000000;
break;
case DTK_MILLISEC:
- result = (fsec * 1000);
+ result = (tm->tm_sec + fsec) * 1000;
break;
case DTK_SECOND:
@@ -2602,7 +2602,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
break;
case DTK_QUARTER:
- result = ((tm->tm_mon - 1) / 3) + 1;
+ result = ((tm->tm_mon - 1) / 3) + 1;
break;
case DTK_WEEK: