aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-01-06 20:11:24 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-01-06 20:11:24 +0000
commit2aee7854696a81e1b2d5292c69b4933185604fee (patch)
tree5e8516cb551037f65d70c2e9ce280f6db674fb2a
parente82858f013fac30c475b84d13c9b78b530a35f50 (diff)
downloadpostgresql-2aee7854696a81e1b2d5292c69b4933185604fee.tar.gz
postgresql-2aee7854696a81e1b2d5292c69b4933185604fee.zip
Fix failure to apply domain constraints to a NULL constant that's added to
an INSERT target list during rule rewriting. Per report from John Supplee.
-rw-r--r--src/backend/rewrite/rewriteManip.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 5f29dbb820e..75e1fb562e9 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.89 2004/12/31 22:00:46 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.89.4.1 2006/01/06 20:11:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,6 +18,7 @@
#include "optimizer/clauses.h"
#include "optimizer/tlist.h"
#include "parser/parsetree.h"
+#include "parser/parse_coerce.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
@@ -897,7 +898,13 @@ resolve_one_var(Var *var, ResolveNew_context *context)
else
{
/* Otherwise replace unmatched var with a null */
- return (Node *) makeNullConst(var->vartype);
+ /* need coerce_to_domain in case of NOT NULL domain constraint */
+ return coerce_to_domain((Node *) makeNullConst(var->vartype),
+ InvalidOid,
+ var->vartype,
+ COERCE_IMPLICIT_CAST,
+ false,
+ false);
}
}
else