diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-12 20:05:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-12 20:05:56 +0000 |
| commit | 3f8db37c2f1eeeffd9dae3189b783a463f56fe77 (patch) | |
| tree | f6520123161af6191b5f53262d67eab69b24eccf /src/backend/rewrite/rewriteDefine.c | |
| parent | 883f4b42d7292f1a7142e55046cee86f92049b5a (diff) | |
| download | postgresql-3f8db37c2f1eeeffd9dae3189b783a463f56fe77.tar.gz postgresql-3f8db37c2f1eeeffd9dae3189b783a463f56fe77.zip | |
Tweak SPI_cursor_open to allow INSERT/UPDATE/DELETE RETURNING; this was
merely a matter of fixing the error check, since the underlying Portal
infrastructure already handles it. This in turn allows these statements
to be used in some existing plpgsql and plperl contexts, such as a
plpgsql FOR loop. Also, do some marginal code cleanup in places that
were being sloppy about distinguishing SELECT from SELECT INTO.
Diffstat (limited to 'src/backend/rewrite/rewriteDefine.c')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 3e1f65d8681..df24c6751c2 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.111 2006/07/18 17:42:00 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.112 2006/08/12 20:05:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -264,7 +264,8 @@ DefineQueryRewrite(RuleStmt *stmt) * ... the one action must be a SELECT, ... */ query = (Query *) linitial(action); - if (!is_instead || query->commandType != CMD_SELECT) + if (!is_instead || + query->commandType != CMD_SELECT || query->into != NULL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("rules on SELECT must have action INSTEAD SELECT"))); |