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

Commitb4d298a

Browse files
author
Michael Meskes
committed
ECPG's parser now accepts and handles variables as arguments for the FREE command.
Informix allows variables as argument to the embedded SQL command FREE. Giventhat we only allow freeing cursors via FREE for compatibility reasons only weshould do the same.
1 parent654fff2 commitb4d298a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

‎src/interfaces/ecpg/preproc/ecpg.addons

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.16 2010/01/29 16:28:13 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.17 2010/03/21 11:56:45 meskes Exp $ */
22
ECPG: stmtClosePortalStmt block
33
{
44
if (INFORMIX_MODE)
@@ -106,10 +106,13 @@ ECPG: stmtViewStmt rule
106106
| ECPGFree
107107
{
108108
const char *con = connection ? connection : "NULL";
109-
if (strcmp($1, "all"))
110-
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
111-
else
109+
110+
if (!strcmp($1, "all"))
112111
fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
112+
else if ($1[0] == ':')
113+
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
114+
else
115+
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
113116

114117
whenever_action(2);
115118
free($1);

‎src/interfaces/ecpg/preproc/ecpg.trailer

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.22 2010/03/20 18:53:00 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.23 2010/03/21 11:56:45 meskes Exp $ */
22

33
statements: /*EMPTY*/
44
| statements statement
@@ -966,7 +966,7 @@ execstring: char_variable
966966
* the exec sql free command to deallocate a previously
967967
* prepared statement
968968
*/
969-
ECPGFree:SQL_FREEname{ $$ = $2; }
969+
ECPGFree:SQL_FREEcursor_name{ $$ = $2; }
970970
| SQL_FREE ALL{ $$ = make_str("all"); }
971971
;
972972

0 commit comments

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