NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0ea4f9c

committed

Back out:

> Attached is a patch that addressed all the discussed issues> that did not break backward compatability, including the> ability to output ISO-8601 compliant intervals by setting> datestyle to iso8601basic.

1 parentced30eb commit0ea4f9cCopy full SHA for 0ea4f9c

File tree

7 files changed

-576

lines changed

doc/src/sgml
- datatype.sgml
src
- backend
  - commands
    - variable.c
  - utils/adt
    - datetime.c
- include
  - miscadmin.h
- interfaces/ecpg/pgtypeslib

7 files changed

-576

lines changed

`‎doc/src/sgml/datatype.sgml`

Lines changed: 1 addition & 60 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.138 2003/12/20 16:06:54 momjian Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.139 2003/12/21 04:34:35 momjian Exp $`
`3`	`3`	`-->`
`4`	`4`
`5`	`5`	`<chapter id="datatype">`
`@@ -1785,55 +1785,6 @@ January 8 04:05:06 1999 PST`
`1785`	`1785`	`<replaceable>p</replaceable> should be between 0 and 6, and`
`1786`	`1786`	`defaults to the precision of the input literal.`
`1787`	`1787`	`</para>`
`1788`		`-`
`1789`		`-`
`1790`		`- <para>`
`1791`		`- Alternatively, <type>interval</type> values can be written as`
`1792`		`- ISO 8601 time intervals, using the "Format with time-unit designators".`
`1793`		`- This format always starts with the character <literal>'P'</>, followed`
`1794`		`- by a string of values followed by single character time-unit designators.`
`1795`		`- A <literal>'T'</> separates the date and time parts of the interval.`
`1796`		`- </para>`
`1797`		`-`
`1798`		`- <para>`
`1799`		`- Format: PnYnMnDTnHnMnS`
`1800`		`- </para>`
`1801`		`- <para>`
`1802`		`- In this format, <literal>'n'</> gets replaced by a number, and`
`1803`		`- <literal>Y</> represents years,`
`1804`		`- <literal>M</> (in the date part) months,`
`1805`		`- <literal>D</> months,`
`1806`		`- <literal>H</> hours,`
`1807`		`- <literal>M</> (in the time part) minutes,`
`1808`		`- and <literal>S</> seconds.`
`1809`		`- </para>`
`1810`		`-`
`1811`		`-`
`1812`		`- <table id="interval-example-table">`
`1813`		`- <title>Interval Example</title>`
`1814`		`- <tgroup cols="2">`
`1815`		`-<thead>`
`1816`		`- <row>`
`1817`		`- <entry>Traditional</entry>`
`1818`		`- <entry>ISO-8601 time-interval</entry>`
`1819`		`- </row>`
`1820`		`-</thead>`
`1821`		`-<tbody>`
`1822`		`- <row>`
`1823`		`- <entry>1 month</entry>`
`1824`		`- <entry>P1M</entry>`
`1825`		`- </row>`
`1826`		`- <row>`
`1827`		`- <entry>1 hour 30 minutes</entry>`
`1828`		`- <entry>PT1H30M</entry>`
`1829`		`- </row>`
`1830`		`- <row>`
`1831`		`- <entry>2 years 10 months 15 days 10 hours 30 minutes 20 seconds</entry>`
`1832`		`- <entry>P2Y10M15DT10H30M20S</entry>`
`1833`		`- </row>`
`1834`		`-</tbody>`
`1835`		`- </tgroup>`
`1836`		`- </table>`
`1837`	`1788`	`</sect3>`
`1838`	`1789`
`1839`	`1790`	`<sect3>`
`@@ -1990,11 +1941,6 @@ January 8 04:05:06 1999 PST`
`1990`	`1941`	`<entry>regional style</entry>`
`1991`	`1942`	`<entry>17.12.1997 07:37:16.00 PST</entry>`
`1992`	`1943`	`</row>`
`1993`		`-<row>`
`1994`		`- <entry>ISO8601basic</entry>`
`1995`		`- <entry>ISO 8601 basic format</entry>`
`1996`		`- <entry>19971217T073716-08</entry>`
`1997`		`-</row>`
`1998`	`1944`	`</tbody>`
`1999`	`1945`	`</tgroup>`
`2000`	`1946`	`</table>`
`@@ -2051,11 +1997,6 @@ January 8 04:05:06 1999 PST`
`2051`	`1997`	`</programlisting>`
`2052`	`1998`	`</para>`
`2053`	`1999`
`2054`		`- <para>`
`2055`		`- If the <varname>datestyle</> is set to iso8601basic, the interval`
`2056`		`- output is a ISO-8601 time interval with time-unit designator (like P1Y6M or PT23H59M59S).`
`2057`		`- </para>`
`2058`		`-`
`2059`	`2000`	`<para>`
`2060`	`2001`	`The date/time styles can be selected by the user using the`
`2061`	`2002`	`<command>SET datestyle</command> command, the`

`‎src/backend/commands/variable.c`

Lines changed: 2 additions & 10 deletions

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.91 2003/12/20 15:32:54 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.92 2003/12/21 04:34:35 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -82,12 +82,7 @@ assign_datestyle(const char *value, bool doit, bool interactive)`
`82`	`82`
`83`	`83`	`/* Ugh. Somebody ought to write a table driven version -- mjl */`
`84`	`84`
`85`		`-if (strcasecmp(tok,"ISO8601BASIC")==0)`
`86`		`-{`
`87`		`-newDateStyle=USE_ISO8601BASIC_DATES;`
`88`		`-scnt++;`
`89`		`-}`
`90`		`-elseif (strcasecmp(tok,"ISO")==0)`
	`85`	`+if (strcasecmp(tok,"ISO")==0)`
`91`	`86`	`{`
`92`	`87`	`newDateStyle=USE_ISO_DATES;`
`93`	`88`	`scnt++;`
`@@ -203,9 +198,6 @@ assign_datestyle(const char *value, bool doit, bool interactive)`
`203`	`198`	`caseUSE_ISO_DATES:`
`204`	`199`	`strcpy(result,"ISO");`
`205`	`200`	`break;`
`206`		`-caseUSE_ISO8601BASIC_DATES:`
`207`		`-strcpy(result,"ISO8601BASIC");`
`208`		`-break;`
`209`	`201`	`caseUSE_SQL_DATES:`
`210`	`202`	`strcpy(result,"SQL");`
`211`	`203`	`break;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0ea4f9c

File tree

7 files changed

7 files changed

`‎doc/src/sgml/datatype.sgml`

`‎src/backend/commands/variable.c`

0 commit comments