diff options
| author | Tom Lane | 2007-09-06 17:31:58 +0000 |
|---|---|---|
| committer | Tom Lane | 2007-09-06 17:31:58 +0000 |
| commit | f8942f4a15fa5baa51c52491147a1bb910532332 (patch) | |
| tree | d8d7b6f9cb19ebbad98e8893abff208a42e492fb /src/backend/rewrite | |
| parent | 190df8a4cfc2a9df911f001b1601c4cc937d5a07 (diff) | |
Make eval_const_expressions() preserve typmod when simplifying something like
null::char(3) to a simple Const node. (It already worked for non-null values,
but not when we skipped evaluation of a strict coercion function.) This
prevents loss of typmod knowledge in situations such as exhibited in bug
#3598. Unfortunately there seems no good way to fix that bug in 8.1 and 8.2,
because they simply don't carry a typmod for a plain Const node.
In passing I made all the other callers of makeNullConst supply "real" typmod
values too, though I think it probably doesn't matter anywhere else.
Diffstat (limited to 'src/backend/rewrite')
| -rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 4 | ||||
| -rw-r--r-- | src/backend/rewrite/rewriteManip.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index cd1cb54e9a..67f46ae4f3 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.173 2007/03/19 23:38:29 wieck Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.174 2007/09/06 17:31:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -193,7 +193,7 @@ AcquireRewriteLocks(Query *parsetree) * now-dropped type OID, but it doesn't really * matter what type the Const claims to be. */ - aliasvar = (Var *) makeNullConst(INT4OID); + aliasvar = (Var *) makeNullConst(INT4OID, -1); } } newaliasvars = lappend(newaliasvars, aliasvar); diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 19b5663890..6170b2f984 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.104 2007/06/11 01:16:25 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.105 2007/09/06 17:31:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -896,7 +896,8 @@ resolve_one_var(Var *var, ResolveNew_context *context) { /* Otherwise replace unmatched var with a null */ /* need coerce_to_domain in case of NOT NULL domain constraint */ - return coerce_to_domain((Node *) makeNullConst(var->vartype), + return coerce_to_domain((Node *) makeNullConst(var->vartype, + var->vartypmod), InvalidOid, -1, var->vartype, COERCE_IMPLICIT_CAST, |