aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser/analyze.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-04-24 02:22:54 +0000
committerBruce Momjian <bruce@momjian.us>2002-04-24 02:22:54 +0000
commitdd4ca824cc91f0c3156d4ed9774b03005d9580e0 (patch)
tree2adc2146f30ab10ba5a763776ed171fd75813970 /src/backend/parser/analyze.c
parente97512345419c35a33c07bde76ab3394652857f2 (diff)
downloadpostgresql-dd4ca824cc91f0c3156d4ed9774b03005d9580e0.tar.gz
postgresql-dd4ca824cc91f0c3156d4ed9774b03005d9580e0.zip
Reports missing values as bad.
BAD: INSERT INTO tab (col1, col2) VALUES ('val1'); GOOD: INSERT INTO tab (col1, col2) VALUES ('val1', 'val2'); Regress tests against DEFAULT and normal values as they're managed slightly different. Rod Taylor
Diffstat (limited to 'src/backend/parser/analyze.c')
-rw-r--r--src/backend/parser/analyze.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index b3b8859d126..c0fe929e497 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.231 2002/04/17 20:57:56 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.232 2002/04/24 02:22:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -547,10 +547,12 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
}
/*
- * XXX It is possible that the targetlist has fewer entries than were
- * in the columns list. We do not consider this an error. Perhaps we
- * should, if the columns list was explicitly given?
+ * Ensure that the targetlist has the same number of entries
+ * that were present in the columns list. Don't do the check
+ * for select statements.
*/
+ if (stmt->cols != NIL && (icolumns != NIL || attnos != NIL))
+ elog(ERROR, "INSERT has more target columns than expressions");
/* done building the range table and jointree */
qry->rtable = pstate->p_rtable;
@@ -3247,7 +3249,7 @@ analyzeCreateSchemaStmt(CreateSchemaStmt *stmt)
}
}
- result = NIL;
+ result = NIL;
result = nconc(result, cxt.tables);
result = nconc(result, cxt.views);
result = nconc(result, cxt.grants);