mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-18 18:44:06 +08:00
Apply date patch from tiemann@cygnus.com,Michael Tiemann.
This commit is contained in:
parent
162c2a6e4c
commit
3ce0236c69
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.8 1997/01/26 15:31:12 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.9 1997/03/02 02:05:33 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -240,32 +240,54 @@ date_smaller(int4 dateVal1, int4 dateVal2)
|
|||||||
int32
|
int32
|
||||||
date_mi(int4 dateVal1, int4 dateVal2)
|
date_mi(int4 dateVal1, int4 dateVal2)
|
||||||
{
|
{
|
||||||
|
int4 dv1, dv2;
|
||||||
DateADT *date1, *date2;
|
DateADT *date1, *date2;
|
||||||
int32 days = 0;
|
int32 days = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
date1 = (DateADT *) &dateVal1;
|
/* This circumlocution allows us to assume that date1 is always
|
||||||
date2 = (DateADT *) &dateVal2;
|
before date2. */
|
||||||
|
dv1 = date_smaller (dateVal1, dateVal2);
|
||||||
|
dv2 = date_larger (dateVal1, dateVal2);
|
||||||
|
date1 = (DateADT *) &dv1;
|
||||||
|
date2 = (DateADT *) &dv2;
|
||||||
|
|
||||||
/* Sum number of days in each full year between date1 and date2. */
|
/* Sum number of days in each full year between date1 and date2. */
|
||||||
for (i = date1->year + 1; i < date2->year; ++i)
|
for (i = date1->year + 1; i < date2->year; ++i)
|
||||||
days += isleap (i) ? 366 : 365;
|
days += isleap (i) ? 366 : 365;
|
||||||
|
|
||||||
/* Add in number of days in each full month from date1 to end of
|
if (days)
|
||||||
year. */
|
{
|
||||||
for (i = date1->month + 1; i <= 12; ++i)
|
/* We need to wrap around the year. Add in number of days in each
|
||||||
days += day_tab[isleap (date1->year)][i - 1];
|
full month from date1 to end of year. */
|
||||||
|
for (i = date1->month + 1; i <= 12; ++i)
|
||||||
|
days += day_tab[isleap (date1->year)][i - 1];
|
||||||
|
|
||||||
/* Add in number of days in each full month from start of year to
|
/* Add in number of days in each full month from start of year to
|
||||||
date2. */
|
date2. */
|
||||||
for (i = 1; i < date2->month; ++i)
|
for (i = 1; i < date2->month; ++i)
|
||||||
days += day_tab[isleap (date2->year)][i - 1];
|
days += day_tab[isleap (date2->year)][i - 1];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Add in number of days in each full month from date1 to date2. */
|
||||||
|
for (i = date1->month + 1; i < date2->month; ++i)
|
||||||
|
days += day_tab[isleap (date1->year)][i - 1];
|
||||||
|
}
|
||||||
|
|
||||||
/* Add in number of days left in month for date1. */
|
if (days || date1->month != date2->month)
|
||||||
days += day_tab[isleap (date1->year)][date1->month - 1] - date1->day;
|
{
|
||||||
|
/* Add in number of days left in month for date1. */
|
||||||
|
days += day_tab[isleap (date1->year)][date1->month - 1] - date1->day;
|
||||||
|
|
||||||
/* Add in day of month of date2. */
|
/* Add in day of month of date2. */
|
||||||
days += date2->day;
|
days += date2->day;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Everything's in the same month, so just subtract the days! */
|
||||||
|
days = date2->day - date1->day;
|
||||||
|
}
|
||||||
|
|
||||||
return (days);
|
return (days);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user