NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit38633cf

committed

Make the world safe for atttypmod=0 ... this didn't use to mean anything,

but timestamp now wants it to mean something.

1 parentdd154dd commit38633cfCopy full SHA for 38633cf

File tree

2 files changed

-9

lines changed

src/backend
- parser
  - parse_coerce.c
- utils/adt
  - format_type.c

2 files changed

-9

lines changed

`‎src/backend/parser/parse_coerce.c‎`

Lines changed: 3 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`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.62 2001/10/03 05:29:12 thomas Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.63 2001/10/04 17:52:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -284,10 +284,9 @@ coerce_type_typmod(ParseState pstate, Node node,`
`284`	`284`	`Oidoid_array[FUNC_MAX_ARGS];`
`285`	`285`
`286`	`286`	`/*`
`287`		`- * We assume that only typmod values greater than 0 indicate a forced`
`288`		`- * conversion is necessary.`
	`287`	`+ * A negative typmod is assumed to mean that no coercion is wanted.`
`289`	`288`	`*/`
`290`		`-if ((atttypmod <=0)\|\|(atttypmod==exprTypmod(node)))`
	`289`	`+if (atttypmod<0\|\|atttypmod==exprTypmod(node))`
`291`	`290`	`returnnode;`
`292`	`291`
`293`	`292`	`funcname=typeidTypeName(targetTypeId);`

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.17 2001/10/03 18:32:42 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.18 2001/10/04 17:52:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -201,31 +201,31 @@ format_type_internal(Oid type_oid, int32 typemod, bool allow_invalid)`
`201`	`201`	`break;`
`202`	`202`
`203`	`203`	`caseTIMEOID:`
`204`		`-if (with_typemod&&typemod>0)`
	`204`	`+if (with_typemod)`
`205`	`205`	`buf=psnprintf(50,"time(%d) without time zone",`
`206`	`206`	`typemod);`
`207`	`207`	`else`
`208`	`208`	`buf=pstrdup("time without time zone");`
`209`	`209`	`break;`
`210`	`210`
`211`	`211`	`caseTIMETZOID:`
`212`		`-if (with_typemod&&typemod>0)`
	`212`	`+if (with_typemod)`
`213`	`213`	`buf=psnprintf(50,"time(%d) with time zone",`
`214`	`214`	`typemod);`
`215`	`215`	`else`
`216`	`216`	`buf=pstrdup("time with time zone");`
`217`	`217`	`break;`
`218`	`218`
`219`	`219`	`caseTIMESTAMPOID:`
`220`		`-if (with_typemod&&typemod>0)`
	`220`	`+if (with_typemod)`
`221`	`221`	`buf=psnprintf(50,"timestamp(%d) without time zone",`
`222`	`222`	`typemod);`
`223`	`223`	`else`
`224`	`224`	`buf=pstrdup("timestamp without time zone");`
`225`	`225`	`break;`
`226`	`226`
`227`	`227`	`caseTIMESTAMPTZOID:`
`228`		`-if (with_typemod&&typemod>0)`
	`228`	`+if (with_typemod)`
`229`	`229`	`buf=psnprintf(50,"timestamp(%d) with time zone",`
`230`	`230`	`typemod);`
`231`	`231`	`else`

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!

Commit38633cf

File tree

2 files changed

2 files changed

`‎src/backend/parser/parse_coerce.c‎`

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

0 commit comments