Reports missing values as bad.

bmomjian · bmomjian · commit dd4ca824cc91 · 2002-04-24T02:22:54.000Z
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
diff --git 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);
diff --git a/src/test/regress/expected/insert.out b/src/test/regress/expected/insert.out
@@ -17,4 +17,24 @@ select * from inserttest;
       |    7 | testing
 (4 rows)
 
+--
+-- insert with similar expression / target_list values (all fail)
+--
+insert into inserttest (col1, col2, col3) values (DEFAULT, DEFAULT);
+ERROR:  INSERT has more target columns than expressions
+insert into inserttest (col1, col2, col3) values (1, 2);
+ERROR:  INSERT has more target columns than expressions
+insert into inserttest (col1) values (1, 2);
+ERROR:  INSERT has more expressions than target columns
+insert into inserttest (col1) values (DEFAULT, DEFAULT);
+ERROR:  INSERT has more expressions than target columns
+select * from inserttest;
+ col1 | col2 |  col3   
+------+------+---------
+      |    3 | testing
+      |    5 | testing
+      |    5 | test
+      |    7 | testing
+(4 rows)
+
 drop table inserttest;
diff --git a/src/test/regress/sql/insert.sql b/src/test/regress/sql/insert.sql
@@ -8,5 +8,15 @@ insert into inserttest (col1, col2, col3) values (DEFAULT, 5, DEFAULT);
 insert into inserttest values (DEFAULT, 5, 'test');
 insert into inserttest values (DEFAULT, 7);
 
+select * from inserttest;
+
+--
+-- insert with similar expression / target_list values (all fail)
+--
+insert into inserttest (col1, col2, col3) values (DEFAULT, DEFAULT);
+insert into inserttest (col1, col2, col3) values (1, 2);
+insert into inserttest (col1) values (1, 2);
+insert into inserttest (col1) values (DEFAULT, DEFAULT);
+
 select * from inserttest;
 drop table inserttest;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.231 2002/04/17 20:57:56 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.232 2002/04/24 02:22:54 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -547,10 +547,12 @@ transformInsertStmt(ParseState pstate, InsertStmt stmt,`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`/*`
`550`		`- * XXX It is possible that the targetlist has fewer entries than were`
`551`		`- * in the columns list. We do not consider this an error. Perhaps we`
`552`		`- * should, if the columns list was explicitly given?`
	`550`	`+ * Ensure that the targetlist has the same number of entries`
	`551`	`+ * that were present in the columns list. Don't do the check`
	`552`	`+ * for select statements.`
`553`	`553`	`*/`
	`554`	`+ if (stmt->cols != NIL && (icolumns != NIL \|\| attnos != NIL))`
	`555`	`+ elog(ERROR, "INSERT has more target columns than expressions");`
`554`	`556`
`555`	`557`	`/* done building the range table and jointree */`
`556`	`558`	`qry->rtable = pstate->p_rtable;`
`@@ -3247,7 +3249,7 @@ analyzeCreateSchemaStmt(CreateSchemaStmt *stmt)`
`3247`	`3249`	`}`
`3248`	`3250`	`}`
`3249`	`3251`
`3250`		`- result = NIL;`
	`3252`	`+ result = NIL;`
`3251`	`3253`	`result = nconc(result, cxt.tables);`
`3252`	`3254`	`result = nconc(result, cxt.views);`
`3253`	`3255`	`result = nconc(result, cxt.grants);`