|
6 | 6 | * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group |
7 | 7 | * Portions Copyright (c) 1994, Regents of the University of California |
8 | 8 | * |
9 | | - *$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.341 2006/08/0201:59:46 joe Exp $ |
| 9 | + *$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.342 2006/08/0213:58:52 tgl Exp $ |
10 | 10 | * |
11 | 11 | *------------------------------------------------------------------------- |
12 | 12 | */ |
@@ -745,10 +745,12 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt, |
745 | 745 | * construct to ensure that the values would be available while |
746 | 746 | * evaluating the VALUES RTE. This is a shame. FIXME |
747 | 747 | */ |
748 | | -if (contain_vars_of_level((Node*)exprsLists,0)) |
| 748 | +if (pstate->p_rtable!=NIL&& |
| 749 | +contain_vars_of_level((Node*)exprsLists,0)) |
749 | 750 | ereport(ERROR, |
750 | 751 | (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), |
751 | | -errmsg("VALUES must not contain OLD or NEW references"))); |
| 752 | +errmsg("VALUES must not contain OLD or NEW references"), |
| 753 | +errhint("Use SELECT ... UNION ALL ... instead."))); |
752 | 754 |
|
753 | 755 | /* |
754 | 756 | * Generate the VALUES RTE |
@@ -2264,10 +2266,12 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) |
2264 | 2266 | * construct to ensure that the values would be available while |
2265 | 2267 | * evaluating the VALUES RTE. This is a shame. FIXME |
2266 | 2268 | */ |
2267 | | -if (contain_vars_of_level((Node*)newExprsLists,0)) |
| 2269 | +if (list_length(pstate->p_rtable)!=1&& |
| 2270 | +contain_vars_of_level((Node*)newExprsLists,0)) |
2268 | 2271 | ereport(ERROR, |
2269 | 2272 | (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), |
2270 | | -errmsg("VALUES must not contain OLD or NEW references"))); |
| 2273 | +errmsg("VALUES must not contain OLD or NEW references"), |
| 2274 | +errhint("Use SELECT ... UNION ALL ... instead."))); |
2271 | 2275 |
|
2272 | 2276 | qry->rtable=pstate->p_rtable; |
2273 | 2277 | qry->jointree=makeFromExpr(pstate->p_joinlist,NULL); |
|