Secondary patch to fix interval to_char() for "HH" where hours >= 12.

bmomjian · bmomjian · commit 4f56dc3fb426 · 2010-02-23T06:29:01.000Z
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.164 2010/02/23 01:42:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.165 2010/02/23 06:29:01 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group
@@ -2089,7 +2089,8 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
 			case DCH_HH:
 			case DCH_HH12:
 				sprintf(s, "%0*d", S_FM(n->suffix) ? 0 : 2,
-						!is_interval && tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ?
+						is_interval ? tm->tm_hour :
+						tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ?
 						12 : tm->tm_hour % (HOURS_PER_DAY / 2));
 				if (S_THth(n->suffix))
 					str_numth(s, s, S_TH_TYPE(n->suffix));

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -----------------------------------------------------------------------`
`2`	`2`	`* formatting.c`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.164 2010/02/23 01:42:19 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.165 2010/02/23 06:29:01 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group`
`@@ -2089,7 +2089,8 @@ DCH_to_char(FormatNode node, bool is_interval, TmToChar in, char *out)`
`2089`	`2089`	`case DCH_HH:`
`2090`	`2090`	`case DCH_HH12:`
`2091`	`2091`	`sprintf(s, "%0*d", S_FM(n->suffix) ? 0 : 2,`
`2092`		`- !is_interval && tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ?`
	`2092`	`+ is_interval ? tm->tm_hour :`
	`2093`	`+ tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ?`
`2093`	`2094`	`12 : tm->tm_hour % (HOURS_PER_DAY / 2));`
`2094`	`2095`	`if (S_THth(n->suffix))`
`2095`	`2096`	`str_numth(s, s, S_TH_TYPE(n->suffix));`