Commita548031

committed

Revert recent change of to_char('HH12') handling for intervals; instead

improve documentation, and add C comment.

1 parent4f56dc3 commita548031Copy full SHA for a548031

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.505 2010/02/19 00:15:25 momjian Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.506 2010/02/23 16:14:25 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<chapter id="functions">`
`4`	`4`	`<title>Functions and Operators</title>`
`@@ -5317,8 +5317,9 @@ SELECT SUBSTRING('XY1234Z', 'Y*?([0-9]{1,3})');`
`5317`	`5317`	`<listitem>`
`5318`	`5318`	`<para>`
`5319`	`5319`	`<function>to_char(interval)</function> formats <literal>HH</> and`
`5320`		`- <literal>HH12</> as hours in a single day, while <literal>HH24</>`
`5321`		`- can output hours exceeding a single day, e.g., >24.`
	`5320`	`+ <literal>HH12</> as shown on a 12-hour clock, i.e. zero hours`
	`5321`	`+ and 36 hours output as <literal>12</>, while <literal>HH24</>`
	`5322`	`+ outputs the full hour value, which can exceed 23 for intervals.`
`5322`	`5323`	`</para>`
`5323`	`5324`	`</listitem>`
`5324`	`5325`

Lines changed: 4 additions & 4 deletions

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.165 2010/02/2306:29:01 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.166 2010/02/2316:14:26 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group`
`@@ -2088,10 +2088,10 @@ DCH_to_char(FormatNode node, bool is_interval, TmToChar in, char *out)`
`2088`	`2088`	`break;`
`2089`	`2089`	`caseDCH_HH:`
`2090`	`2090`	`caseDCH_HH12:`
	`2091`	`+/* display time as shown on a 12-hour clock, even for intervals */`
`2091`	`2092`	`sprintf(s,"%0*d",S_FM(n->suffix) ?0 :2,`
`2092`		`-is_interval ?tm->tm_hour :`
`2093`		`-tm->tm_hour % (HOURS_PER_DAY /2)==0 ?`
`2094`		`-12 :tm->tm_hour % (HOURS_PER_DAY /2));`
	`2093`	`+tm->tm_hour % (HOURS_PER_DAY /2)==0 ?12 :`
	`2094`	`+tm->tm_hour % (HOURS_PER_DAY /2));`
`2095`	`2095`	`if (S_THth(n->suffix))`
`2096`	`2096`	`str_numth(s,s,S_TH_TYPE(n->suffix));`
`2097`	`2097`	`s+=strlen(s);`

Comments

(0)