aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/execMain.c
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2004-01-10 23:28:45 +0000
committerNeil Conway <neilc@samurai.com>2004-01-10 23:28:45 +0000
commit98dcf085e35e393bdd6740e6a8f8684b27ac2039 (patch)
treed09c442bd3c5125b18e47e890b99463f08b6ffe6 /src/backend/executor/execMain.c
parentcf4c925dd420a969351d83d584366c167ae54d25 (diff)
downloadpostgresql-98dcf085e35e393bdd6740e6a8f8684b27ac2039.tar.gz
postgresql-98dcf085e35e393bdd6740e6a8f8684b27ac2039.zip
Implement "WITH / WITHOID OIDS" clause for CREATE TABLE AS. This is
intended to allow application authors to insulate themselves from changes to the default value of 'default_with_oids' in future releases of PostgreSQL. This patch also fixes a bug in the earlier implementation of the 'default_with_oids' GUC variable: code in gram.y should not examine the value of GUC variables directly due to synchronization issues.
Diffstat (limited to 'src/backend/executor/execMain.c')
-rw-r--r--src/backend/executor/execMain.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index cf581907a4f..9d64c979e08 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.225 2004/01/07 18:56:26 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.226 2004/01/10 23:28:44 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -593,14 +593,7 @@ InitPlan(QueryDesc *queryDesc, bool explainOnly)
if (operation == CMD_SELECT && parseTree->into != NULL)
{
do_select_into = true;
-
- /*
- * The presence of OIDs in the result set of SELECT INTO is
- * controlled by the default_with_oids GUC parameter. The
- * behavior in versions of PostgreSQL prior to 7.5 is to
- * always include OIDs.
- */
- estate->es_force_oids = default_with_oids;
+ estate->es_force_oids = parseTree->intoHasOids;
}
/*