Commite88a7ad

committed

Ooops, got only one of the two ArrayExpr variants correct in first

cut at exprTypmod support. Also, experimentation shows that we needto label the type of Const nodes that are numeric with a specifictypmod.

1 parent0f4ff46 commite88a7adCopy full SHA for e88a7ad

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 7 additions & 3 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/parser/parse_expr.c,v 1.213 2007/03/1700:11:04 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.214 2007/03/1701:15:55 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1958,7 +1958,7 @@ exprTypmod(Node *expr)`
`1958`	`1958`	`* typmod, else use -1`
`1959`	`1959`	`*/`
`1960`	`1960`	`ArrayExprarrayexpr= (ArrayExpr)expr;`
`1961`		`-Oidarraytype=arrayexpr->array_typeid;`
	`1961`	`+Oidcommontype;`
`1962`	`1962`	`int32typmod;`
`1963`	`1963`	`ListCell*elem;`
`1964`	`1964`
`@@ -1967,11 +1967,15 @@ exprTypmod(Node *expr)`
`1967`	`1967`	`typmod=exprTypmod((Node*)linitial(arrayexpr->elements));`
`1968`	`1968`	`if (typmod<0)`
`1969`	`1969`	`return-1;/* no point in trying harder */`
	`1970`	`+if (arrayexpr->multidims)`
	`1971`	`+commontype=arrayexpr->array_typeid;`
	`1972`	`+else`
	`1973`	`+commontype=arrayexpr->element_typeid;`
`1970`	`1974`	`foreach(elem,arrayexpr->elements)`
`1971`	`1975`	`{`
`1972`	`1976`	`Nodee= (Node)lfirst(elem);`
`1973`	`1977`
`1974`		`-if (exprType(e)!=arraytype)`
	`1978`	`+if (exprType(e)!=commontype)`
`1975`	`1979`	`return-1;`
`1976`	`1980`	`if (exprTypmod(e)!=typmod)`
`1977`	`1981`	`return-1;`

Lines changed: 6 additions & 3 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/utils/adt/ruleutils.c,v 1.254 2007/03/1700:11:05 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.255 2007/03/1701:15:55 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -4427,8 +4427,11 @@ get_const_expr(Const constval, deparse_context context, bool showtype)`
`4427`	`4427`	`needlabel= false;`
`4428`	`4428`	`break;`
`4429`	`4429`	`caseNUMERICOID:`
`4430`		`-/* Float-looking constants will be typed as numeric */`
`4431`		`-needlabel= !isfloat;`
	`4430`	`+/*`
	`4431`	`+ * Float-looking constants will be typed as numeric, but if`
	`4432`	`+ * there's a specific typmod we need to show it.`
	`4433`	`+ */`
	`4434`	`+needlabel= !isfloat\|\| (constval->consttypmod >=0);`
`4432`	`4435`	`break;`
`4433`	`4436`	`default:`
`4434`	`4437`	`needlabel= true;`

Comments

(0)