database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Fix AT TIME ZONE for timestamps without time zones:

Browse Source 
test=> select (CURRENT_DATE + '05:00'::time)::timestamp at time zone
	'Canada/Pacific';
	        timezone
	------------------------
	 2005-07-22 08:00:00-04
	(1 row)
This commit is contained in:
Bruce Momjian
2005-07-23 02:02:27 +00:00
parent 261026575d
commit 5ddeffb676
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.142 2005/07/22 21:16:15 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.143 2005/07/23 02:02:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3922,10 +3922,14 @@ interval_part(PG_FUNCTION_ARGS)
} }
/* timestamp_zone() /* timestamp_zone()
* Encode timestamp type with specified time zone. * Encode timestamp type with specified time zone.
* Returns timestamp with time zone, with the input * Returns timestamp with time zone, with the input
* rotated from local time to the specified zone. * rotated from local time to the specified zone.
* This function is tricky because instead of shifting
* the time _to_ a new time zone, it sets the time to _be_
* the specified timezone. This requires trickery
* of double-subtracting the requested timezone offset.
*/ */
Datum Datum
timestamp_zone(PG_FUNCTION_ARGS) timestamp_zone(PG_FUNCTION_ARGS)
@ -3960,7 +3964,7 @@ timestamp_zone(PG_FUNCTION_ARGS)
/* Apply the timezone change */ /* Apply the timezone change */
if (timestamp2tm(timestamp, &tz, &tm, &fsec, NULL, tzp) != 0 || if (timestamp2tm(timestamp, &tz, &tm, &fsec, NULL, tzp) != 0 ||
tm2timestamp(&tm, fsec, NULL, &result) != 0) tm2timestamp(&tm, fsec, &tz, &result) != 0)
{ {
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@ -3968,6 +3972,9 @@ timestamp_zone(PG_FUNCTION_ARGS)
tzname))); tzname)));
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
/* Must double-adjust for timezone */
result = dt2local(result, -tz);
PG_RETURN_TIMESTAMPTZ(result); PG_RETURN_TIMESTAMPTZ(result);
} }