Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb4bdab8

Browse files
committed
Fix integer timestamp build for macro changes.
1 parentaa0f6e8 commitb4bdab8

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎src/backend/utils/adt/timestamp.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.136 2005/07/2104:41:43 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.137 2005/07/2105:18:26 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1208,8 +1208,8 @@ tm2interval(struct pg_tm *tm, fsec_t fsec, Interval *span)
12081208
span->month=tm->tm_year*MONTHS_PER_YEAR+tm->tm_mon;
12091209
span->day=tm->tm_mday;
12101210
#ifdefHAVE_INT64_TIMESTAMP
1211-
span->time= (((((tm->tm_hour*INT64CONST(SECS_PER_MINUTE))+
1212-
tm->tm_min)*INT64CONST(SECS_PER_MINUTE))+
1211+
span->time= (((((tm->tm_hour*INT64CONST(60))+
1212+
tm->tm_min)*INT64CONST(60))+
12131213
tm->tm_sec)*USECS_PER_SEC)+fsec;
12141214
#else
12151215
span->time= (((tm->tm_hour* (double)SECS_PER_MINUTE)+
@@ -1608,10 +1608,10 @@ interval_cmp_internal(Interval *interval1, Interval *interval2)
16081608
span2=interval2->time;
16091609

16101610
#ifdefHAVE_INT64_TIMESTAMP
1611-
span1+=interval1->month*INT64CONST(DAYS_PER_MONTH)*USECS_PER_DAY;
1612-
span1+=interval1->day*INT64CONST(HOURS_PER_DAY)*USECS_PER_HOUR;
1613-
span2+=interval2->month*INT64CONST(DAYS_PER_MONTH)*USECS_PER_DAY;
1614-
span2+=interval2->day*INT64CONST(HOURS_PER_DAY)*USECS_PER_HOUR;
1611+
span1+=interval1->month*INT64CONST(30)*USECS_PER_DAY;
1612+
span1+=interval1->day*INT64CONST(24)*USECS_PER_HOUR;
1613+
span2+=interval2->month*INT64CONST(30)*USECS_PER_DAY;
1614+
span2+=interval2->day*INT64CONST(24)*USECS_PER_HOUR;
16151615
#else
16161616
span1+=interval1->month* ((double)DAYS_PER_MONTH*SECS_PER_DAY);
16171617
span1+=interval1->day* ((double)HOURS_PER_DAY*SECS_PER_HOUR);
@@ -2264,8 +2264,8 @@ interval_mul(PG_FUNCTION_ARGS)
22642264
result->month=months;
22652265
result->day=days;
22662266
result->time=span1->time*factor;
2267-
result->time+= (months-result->month)*INT64CONST(DAYS_PER_MONTH)*USECS_PER_DAY;
2268-
result->time+= (days-result->day)*INT64CONST(HOURS_PER_DAY)*USECS_PER_HOUR;
2267+
result->time+= (months-result->month)*INT64CONST(30)*USECS_PER_DAY;
2268+
result->time+= (days-result->day)*INT64CONST(24)*USECS_PER_HOUR;
22692269
#else
22702270
result->month= (int)months;
22712271
result->day= (int)days;

‎src/interfaces/ecpg/pgtypeslib/interval.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,9 +717,9 @@ tm2interval(struct tm *tm, fsec_t fsec, interval *span)
717717
{
718718
span->month=tm->tm_year*MONTHS_PER_YEAR+tm->tm_mon;
719719
#ifdefHAVE_INT64_TIMESTAMP
720-
span->time= (((((((tm->tm_mday*INT64CONST(HOURS_PER_DAY))+
721-
tm->tm_hour)*INT64CONST(SECS_PER_MINUTE))+
722-
tm->tm_min)*INT64CONST(SECS_PER_MINUTE))+
720+
span->time= (((((((tm->tm_mday*INT64CONST(24))+
721+
tm->tm_hour)*INT64CONST(60))+
722+
tm->tm_min)*INT64CONST(60))+
723723
tm->tm_sec)*USECS_PER_SEC)+fsec;
724724
#else
725725
span->time= (((((tm->tm_mday* (double)HOURS_PER_DAY)+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp