aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-01-06 20:11:18 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-01-06 20:11:18 +0000
commit4b1f09d5bd48e13718763a60ede2646d69073849 (patch)
treeb2e83e6b0c296bdf4caf1ab6f58eb87e1be7e136 /src
parent68f4ed462ad0c6de5de5060764b0f09f2c184d40 (diff)
downloadpostgresql-4b1f09d5bd48e13718763a60ede2646d69073849.tar.gz
postgresql-4b1f09d5bd48e13718763a60ede2646d69073849.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.
Diffstat (limited to 'src')
-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 71e8e39ae6a..8131298dd45 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.92.2.2 2005/11/23 17:21:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.92.2.3 2006/01/06 20:11:18 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"
@@ -838,7 +839,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