diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/portalcmds.c | 5 | ||||
| -rw-r--r-- | src/backend/commands/prepare.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index 6efd09c44b1..5a93aec6890 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.69 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.69.2.1 2008/04/02 18:32:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -76,6 +76,9 @@ PerformCursorOpen(PlannedStmt *stmt, ParamListInfo params, stmt = copyObject(stmt); stmt->utilityStmt = NULL; /* make it look like plain SELECT */ + if (queryString) /* copy the source text too for safety */ + queryString = pstrdup(queryString); + PortalDefineQuery(portal, NULL, queryString, diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index 2199e109d46..7dcd3cb5a85 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -10,7 +10,7 @@ * Copyright (c) 2002-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.80 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.80.2.1 2008/04/02 18:32:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -249,9 +249,13 @@ ExecuteQuery(ExecuteStmt *stmt, const char *queryString, plan_list = cplan->stmt_list; } + /* + * Note: we don't bother to copy the source query string into the portal. + * Any errors it might be useful for will already have been reported. + */ PortalDefineQuery(portal, NULL, - entry->plansource->query_string, + NULL, entry->plansource->commandTag, plan_list, cplan); |