database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Fix to_date() and to_timestamp() to allow specification of the day of

Browse Source 
the week via ISO or Gregorian designations.  The fix is to store the
day-of-week consistently as 1-7, Sunday = 1.

Fixes bug reported by Marc Munro
This commit is contained in:
Bruce Momjian
2012-09-03 22:52:34 -04:00
parent e442b0f0c6
commit 015722fb36
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/adt/timestamp.c
View File

@ -3775,18 +3775,22 @@ isoweek2date(int woy, int *year, int *mon, int *mday)
/* isoweekdate2date()
*
* Convert an ISO 8601 week date (ISO year, ISO week and day of week) into a Gregorian date.
* Convert an ISO 8601 week date (ISO year, ISO week) into a Gregorian date.
* Gregorian day of week sent so weekday strings can be supplied.
* Populates year, mon, and mday with the correct Gregorian values.
* year must be passed in as the ISO year.
*/
void
isoweekdate2date(int isoweek, int isowday, int *year, int *mon, int *mday)
isoweekdate2date(int isoweek, int wday, int *year, int *mon, int *mday)
{
int jday;
jday = isoweek2j(*year, isoweek);
jday += isowday - 1;
/* convert Gregorian week start (Sunday=1) to ISO week start (Monday=1) */
if (wday > 1)
jday += wday - 2;
else
jday += 6;
j2date(jday, year, mon, mday);
}