NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfbdb203

committed

Back out part of patch that should be applied later.

1 parent22f0303 commitfbdb203Copy full SHA for fbdb203

File tree

3 files changed

+28

-25

lines changed

src
- backend/utils/adt
  - datetime.c
- interfaces/ecpg/pgtypeslib
  - interval.c
- test/regress/expected
  - horology.out

3 files changed

+28

-25

lines changed

`‎src/backend/utils/adt/datetime.c`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.148 2005/05/27 15:15:23 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.149 2005/05/27 15:16:44 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3461,9 +3461,12 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int tzp, int style, char str)`
`3461`	`3461`	`#ifdefHAVE_INT64_TIMESTAMP`
`3462`	`3462`	`sprintf(str+strlen(str),":%02d.%06d",tm->tm_sec,fsec);`
`3463`	`3463`	`#else`
`3464`		`-sprintf(str+strlen(str),":%012.9f",tm->tm_sec+fsec);`
	`3464`	`+sprintf(str+strlen(str),":%013.10f",tm->tm_sec+fsec);`
`3465`	`3465`	`#endif`
`3466`		`-TrimTrailingZeros(str);`
	`3466`	`+/* chop off trailing pairs of zeros... */`
	`3467`	`+while (strcmp((str+strlen(str)-2),"00")==0&&`
	`3468`	`+*(str+strlen(str)-3)!='.')`
	`3469`	`+*(str+strlen(str)-2)='\0';`
`3467`	`3470`	`}`
`3468`	`3471`	`else`
`3469`	`3472`	`sprintf(str+strlen(str),":%02d",tm->tm_sec);`
`@@ -3801,7 +3804,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)`
`3801`	`3804`	`sprintf(cp,".%06d",Abs(fsec));`
`3802`	`3805`	`#else`
`3803`	`3806`	`fsec+=tm->tm_sec;`
`3804`		`-sprintf(cp,":%012.9f",fabs(fsec));`
	`3807`	`+sprintf(cp,":%013.10f",fabs(fsec));`
`3805`	`3808`	`#endif`
`3806`	`3809`	`TrimTrailingZeros(cp);`
`3807`	`3810`	`cp+=strlen(cp);`

`‎src/interfaces/ecpg/pgtypeslib/interval.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)`
`511`	`511`	`sprintf(cp,".%06d",Abs(fsec));`
`512`	`512`	`#else`
`513`	`513`	`fsec+=tm->tm_sec;`
`514`		`-sprintf(cp,":%012.9f",fabs(fsec));`
	`514`	`+sprintf(cp,":%013.10f",fabs(fsec));`
`515`	`515`	`#endif`
`516`	`516`	`TrimTrailingZeros(cp);`
`517`	`517`	`cp+=strlen(cp);`

`‎src/test/regress/expected/horology.out`

Lines changed: 20 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,62 +205,62 @@ SET DateStyle = 'ISO';`
`205`	`205`	`-- As of 7.4, allow time without time zone having a time zone specified`
`206`	`206`	`SELECT time without time zone '040506.789+08';`
`207`	`207`	`time`
`208`		`---------------`
`209`		`- 04:05:06.789`
	`208`	`+---------------`
	`209`	`+ 04:05:06.7890`
`210`	`210`	`(1 row)`
`211`	`211`
`212`	`212`	`SELECT time without time zone '040506.789-08';`
`213`	`213`	`time`
`214`		`---------------`
`215`		`- 04:05:06.789`
	`214`	`+---------------`
	`215`	`+ 04:05:06.7890`
`216`	`216`	`(1 row)`
`217`	`217`
`218`	`218`	`SELECT time without time zone 'T040506.789+08';`
`219`	`219`	`time`
`220`		`---------------`
`221`		`- 04:05:06.789`
	`220`	`+---------------`
	`221`	`+ 04:05:06.7890`
`222`	`222`	`(1 row)`
`223`	`223`
`224`	`224`	`SELECT time without time zone 'T040506.789-08';`
`225`	`225`	`time`
`226`		`---------------`
`227`		`- 04:05:06.789`
	`226`	`+---------------`
	`227`	`+ 04:05:06.7890`
`228`	`228`	`(1 row)`
`229`	`229`
`230`	`230`	`SELECT time with time zone '040506.789+08';`
`231`	`231`	`timetz`
`232`		`------------------`
`233`		`- 04:05:06.789+08`
	`232`	`+------------------`
	`233`	`+ 04:05:06.7890+08`
`234`	`234`	`(1 row)`
`235`	`235`
`236`	`236`	`SELECT time with time zone '040506.789-08';`
`237`	`237`	`timetz`
`238`		`------------------`
`239`		`- 04:05:06.789-08`
	`238`	`+------------------`
	`239`	`+ 04:05:06.7890-08`
`240`	`240`	`(1 row)`
`241`	`241`
`242`	`242`	`SELECT time with time zone 'T040506.789+08';`
`243`	`243`	`timetz`
`244`		`------------------`
`245`		`- 04:05:06.789+08`
	`244`	`+------------------`
	`245`	`+ 04:05:06.7890+08`
`246`	`246`	`(1 row)`
`247`	`247`
`248`	`248`	`SELECT time with time zone 'T040506.789-08';`
`249`	`249`	`timetz`
`250`		`------------------`
`251`		`- 04:05:06.789-08`
	`250`	`+------------------`
	`251`	`+ 04:05:06.7890-08`
`252`	`252`	`(1 row)`
`253`	`253`
`254`	`254`	`SELECT time with time zone 'T040506.789 +08';`
`255`	`255`	`timetz`
`256`		`------------------`
`257`		`- 04:05:06.789+08`
	`256`	`+------------------`
	`257`	`+ 04:05:06.7890+08`
`258`	`258`	`(1 row)`
`259`	`259`
`260`	`260`	`SELECT time with time zone 'T040506.789 -08';`
`261`	`261`	`timetz`
`262`		`------------------`
`263`		`- 04:05:06.789-08`
	`262`	`+------------------`
	`263`	`+ 04:05:06.7890-08`
`264`	`264`	`(1 row)`
`265`	`265`
`266`	`266`	`SET DateStyle = 'Postgres, MDY';`

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!

Commitfbdb203

File tree

3 files changed

3 files changed

`‎src/backend/utils/adt/datetime.c`

`‎src/interfaces/ecpg/pgtypeslib/interval.c`

`‎src/test/regress/expected/horology.out`

0 commit comments