|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.142 2005/07/22 21:16:15 momjian Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.143 2005/07/23 02:02:27 momjian Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -3922,10 +3922,14 @@ interval_part(PG_FUNCTION_ARGS) |
3922 | 3922 | } |
3923 | 3923 |
|
3924 | 3924 |
|
3925 | | -/* timestamp_zone() |
3926 | | - * Encode timestamp type with specified time zone. |
3927 | | - * Returns timestamp with time zone, with the input |
| 3925 | +/*timestamp_zone() |
| 3926 | + *Encode timestamp type with specified time zone. |
| 3927 | + *Returns timestamp with time zone, with the input |
3928 | 3928 | *rotated from local time to the specified zone. |
| 3929 | + *This function is tricky because instead of shifting |
| 3930 | + *the time _to_ a new time zone, it sets the time to _be_ |
| 3931 | + *the specified timezone. This requires trickery |
| 3932 | + *of double-subtracting the requested timezone offset. |
3929 | 3933 | */ |
3930 | 3934 | Datum |
3931 | 3935 | timestamp_zone(PG_FUNCTION_ARGS) |
@@ -3960,14 +3964,17 @@ timestamp_zone(PG_FUNCTION_ARGS) |
3960 | 3964 |
|
3961 | 3965 | /* Apply the timezone change */ |
3962 | 3966 | if (timestamp2tm(timestamp,&tz,&tm,&fsec,NULL,tzp)!=0|| |
3963 | | -tm2timestamp(&tm,fsec,NULL,&result)!=0) |
| 3967 | +tm2timestamp(&tm,fsec,&tz,&result)!=0) |
3964 | 3968 | { |
3965 | 3969 | ereport(ERROR, |
3966 | 3970 | (errcode(ERRCODE_INVALID_PARAMETER_VALUE), |
3967 | 3971 | errmsg("could not convert to time zone \"%s\"", |
3968 | 3972 | tzname))); |
3969 | 3973 | PG_RETURN_NULL(); |
3970 | 3974 | } |
| 3975 | +/* Must double-adjust for timezone */ |
| 3976 | +result=dt2local(result,-tz); |
| 3977 | + |
3971 | 3978 | PG_RETURN_TIMESTAMPTZ(result); |
3972 | 3979 | } |
3973 | 3980 |
|
|