Code for SET/SHOW TIME ZONE with a fixed-interval timezone was not

tglsfdc · tglsfdc · commit 27bdb0c40d13 · 2005-06-05T01:48:34.000Z
prepared for HAVE_INT64_TIMESTAMP.  Per report from Guillaume Beaudoin.
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.106 2005/04/19 03:13:58 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.107 2005/06/05 01:48:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -284,7 +284,11 @@ assign_timezone(const char *value, bool doit, GucSource source)
 		if (doit)
 		{
 			/* Here we change from SQL to Unix sign convention */
+#ifdef HAVE_INT64_TIMESTAMP
+			CTimeZone = -(interval->time / USECS_PER_SEC);
+#else
 			CTimeZone = -interval->time;
+#endif
 
 			HasCTZSet = true;
 		}
@@ -398,8 +402,12 @@ show_timezone(void)
 	{
 		Interval interval;
 
-		interval.	month = 0;
-		interval.	time = -CTimeZone;
+		interval.month = 0;
+#ifdef HAVE_INT64_TIMESTAMP
+		interval.time = -(CTimeZone * USECS_PER_SEC);
+#else
+		interval.time = -CTimeZone;
+#endif
 
 		tzn = DatumGetCString(DirectFunctionCall1(interval_out,
 										  IntervalPGetDatum(&interval)));

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.106 2005/04/19 03:13:58 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.107 2005/06/05 01:48:34 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -284,7 +284,11 @@ assign_timezone(const char *value, bool doit, GucSource source)`
`284`	`284`	`if (doit)`
`285`	`285`	`{`
`286`	`286`	`/* Here we change from SQL to Unix sign convention */`
	`287`	`+#ifdef HAVE_INT64_TIMESTAMP`
	`288`	`+ CTimeZone = -(interval->time / USECS_PER_SEC);`
	`289`	`+#else`
`287`	`290`	`CTimeZone = -interval->time;`
	`291`	`+#endif`
`288`	`292`
`289`	`293`	`HasCTZSet = true;`
`290`	`294`	`}`
`@@ -398,8 +402,12 @@ show_timezone(void)`
`398`	`402`	`{`
`399`	`403`	`Interval interval;`
`400`	`404`
`401`		`- interval. month = 0;`
`402`		`- interval. time = -CTimeZone;`
	`405`	`+ interval.month = 0;`
	`406`	`+#ifdef HAVE_INT64_TIMESTAMP`
	`407`	`+ interval.time = -(CTimeZone * USECS_PER_SEC);`
	`408`	`+#else`
	`409`	`+ interval.time = -CTimeZone;`
	`410`	`+#endif`
`403`	`411`
`404`	`412`	`tzn = DatumGetCString(DirectFunctionCall1(interval_out,`
`405`	`413`	`IntervalPGetDatum(&interval)));`