Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9a39423

Browse files
committed
Fix EXPLAIN and EXECUTE commands to pass portal parameters through to
the executor. This allows, for example, JDBC clients to use '?' boundparameters in these commands. Per gripe from Virag Saksena.
1 parent4ab76b1 commit9a39423

File tree

5 files changed

+29
-21
lines changed

5 files changed

+29
-21
lines changed

‎src/backend/commands/explain.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994-5, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.141 2005/11/26 22:14:56 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.142 2005/11/29 01:25:49 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,7 +45,7 @@ typedef struct ExplainState
4545
}ExplainState;
4646

4747
staticvoidExplainOneQuery(Query*query,ExplainStmt*stmt,
48-
TupOutputState*tstate);
48+
ParamListInfoparams,TupOutputState*tstate);
4949
staticdoubleelapsed_time(instr_time*starttime);
5050
staticvoidexplain_outNode(StringInfostr,
5151
Plan*plan,PlanState*planstate,
@@ -67,7 +67,7 @@ static void show_sort_keys(List *tlist, int nkeys, AttrNumber *keycols,
6767
* execute an EXPLAIN command
6868
*/
6969
void
70-
ExplainQuery(ExplainStmt*stmt,DestReceiver*dest)
70+
ExplainQuery(ExplainStmt*stmt,ParamListInfoparams,DestReceiver*dest)
7171
{
7272
Query*query=stmt->query;
7373
TupOutputState*tstate;
@@ -91,9 +91,9 @@ ExplainQuery(ExplainStmt *stmt, DestReceiver *dest)
9191
{
9292
/* Rewriter will not cope with utility statements */
9393
if (query->utilityStmt&&IsA(query->utilityStmt,DeclareCursorStmt))
94-
ExplainOneQuery(query,stmt,tstate);
94+
ExplainOneQuery(query,stmt,params,tstate);
9595
elseif (query->utilityStmt&&IsA(query->utilityStmt,ExecuteStmt))
96-
ExplainExecuteQuery(stmt,tstate);
96+
ExplainExecuteQuery(stmt,params,tstate);
9797
else
9898
do_text_output_oneline(tstate,"Utility statements have no plan structure");
9999
}
@@ -118,7 +118,7 @@ ExplainQuery(ExplainStmt *stmt, DestReceiver *dest)
118118
/* Explain every plan */
119119
foreach(l,rewritten)
120120
{
121-
ExplainOneQuery(lfirst(l),stmt,tstate);
121+
ExplainOneQuery(lfirst(l),stmt,params,tstate);
122122
/* put a blank line between plans */
123123
if (lnext(l)!=NULL)
124124
do_text_output_oneline(tstate,"");
@@ -150,7 +150,8 @@ ExplainResultDesc(ExplainStmt *stmt)
150150
* print out the execution plan for one query
151151
*/
152152
staticvoid
153-
ExplainOneQuery(Query*query,ExplainStmt*stmt,TupOutputState*tstate)
153+
ExplainOneQuery(Query*query,ExplainStmt*stmt,ParamListInfoparams,
154+
TupOutputState*tstate)
154155
{
155156
Plan*plan;
156157
QueryDesc*queryDesc;
@@ -208,7 +209,7 @@ ExplainOneQuery(Query *query, ExplainStmt *stmt, TupOutputState *tstate)
208209
/* Create a QueryDesc requesting no output */
209210
queryDesc=CreateQueryDesc(query,plan,
210211
ActiveSnapshot,InvalidSnapshot,
211-
None_Receiver,NULL,
212+
None_Receiver,params,
212213
stmt->analyze);
213214

214215
ExplainOnePlan(queryDesc,stmt,tstate);

‎src/backend/commands/prepare.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.42 2005/10/21 16:43:33 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.43 2005/11/29 01:25:49 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -121,7 +121,8 @@ PrepareQuery(PrepareStmt *stmt)
121121
* Implements the 'EXECUTE' utility statement.
122122
*/
123123
void
124-
ExecuteQuery(ExecuteStmt*stmt,DestReceiver*dest,char*completionTag)
124+
ExecuteQuery(ExecuteStmt*stmt,ParamListInfoparams,
125+
DestReceiver*dest,char*completionTag)
125126
{
126127
PreparedStatement*entry;
127128
char*query_string;
@@ -150,6 +151,7 @@ ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest, char *completionTag)
150151
* of query, in case parameters are pass-by-reference.
151152
*/
152153
estate=CreateExecutorState();
154+
estate->es_param_list_info=params;
153155
paramLI=EvaluateParams(estate,stmt->params,entry->argtype_list);
154156
}
155157

@@ -538,7 +540,8 @@ DropPreparedStatement(const char *stmt_name, bool showError)
538540
* Implements the 'EXPLAIN EXECUTE' utility statement.
539541
*/
540542
void
541-
ExplainExecuteQuery(ExplainStmt*stmt,TupOutputState*tstate)
543+
ExplainExecuteQuery(ExplainStmt*stmt,ParamListInfoparams,
544+
TupOutputState*tstate)
542545
{
543546
ExecuteStmt*execstmt= (ExecuteStmt*)stmt->query->utilityStmt;
544547
PreparedStatement*entry;
@@ -568,6 +571,7 @@ ExplainExecuteQuery(ExplainStmt *stmt, TupOutputState *tstate)
568571
* of query, in case parameters are pass-by-reference.
569572
*/
570573
estate=CreateExecutorState();
574+
estate->es_param_list_info=params;
571575
paramLI=EvaluateParams(estate,execstmt->params,
572576
entry->argtype_list);
573577
}

‎src/backend/tcop/utility.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.249 2005/11/22 18:17:22 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.250 2005/11/29 01:25:49 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -365,7 +365,7 @@ check_xact_readonly(Node *parsetree)
365365
*general utility function invoker
366366
*
367367
*parsetree: the parse tree for the utility statement
368-
*params: parameters to use during execution (currently only used by DECLARE)
368+
*params: parameters to use during execution
369369
*dest: where to send results
370370
*completionTag: points to a buffer of size COMPLETION_TAG_BUFSIZE
371371
*in which to store a command completion status string.
@@ -648,7 +648,8 @@ ProcessUtility(Node *parsetree,
648648
break;
649649

650650
caseT_ExecuteStmt:
651-
ExecuteQuery((ExecuteStmt*)parsetree,dest,completionTag);
651+
ExecuteQuery((ExecuteStmt*)parsetree,params,
652+
dest,completionTag);
652653
break;
653654

654655
caseT_DeallocateStmt:
@@ -891,7 +892,7 @@ ProcessUtility(Node *parsetree,
891892
break;
892893

893894
caseT_ExplainStmt:
894-
ExplainQuery((ExplainStmt*)parsetree,dest);
895+
ExplainQuery((ExplainStmt*)parsetree,params,dest);
895896
break;
896897

897898
caseT_VariableSetStmt:

‎src/include/commands/explain.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994-5, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.24 2004/12/31 22:03:28 pgsql Exp $
9+
* $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.25 2005/11/29 01:25:50 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -18,7 +18,8 @@
1818
#include"tcop/dest.h"
1919

2020

21-
externvoidExplainQuery(ExplainStmt*stmt,DestReceiver*dest);
21+
externvoidExplainQuery(ExplainStmt*stmt,ParamListInfoparams,
22+
DestReceiver*dest);
2223

2324
externTupleDescExplainResultDesc(ExplainStmt*stmt);
2425

‎src/include/commands/prepare.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
88
*
9-
* $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.14 2005/06/22 17:45:46 tgl Exp $
9+
* $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.15 2005/11/29 01:25:50 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -42,10 +42,11 @@ typedef struct
4242

4343
/* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */
4444
externvoidPrepareQuery(PrepareStmt*stmt);
45-
externvoidExecuteQuery(ExecuteStmt*stmt,DestReceiver*dest,
46-
char*completionTag);
45+
externvoidExecuteQuery(ExecuteStmt*stmt,ParamListInfoparams,
46+
DestReceiver*dest,char*completionTag);
4747
externvoidDeallocateQuery(DeallocateStmt*stmt);
48-
externvoidExplainExecuteQuery(ExplainStmt*stmt,TupOutputState*tstate);
48+
externvoidExplainExecuteQuery(ExplainStmt*stmt,ParamListInfoparams,
49+
TupOutputState*tstate);
4950

5051
/* Low-level access to stored prepared statements */
5152
externvoidStorePreparedStatement(constchar*stmt_name,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp