mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

ECPG's parser now accepts and handles variables as arguments for the FREE command.

Browse Source 
Informix allows variables as argument to the embedded SQL command FREE. Given
that we only allow freeing cursors via FREE for compatibility reasons only we
should do the same.
This commit is contained in:
Michael Meskes 2010-03-21 11:56:45 +00:00
parent 654fff2311
commit b4d298ac23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/interfaces/ecpg/preproc/ecpg.addons
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.16 2010/01/29 16:28:13 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.17 2010/03/21 11:56:45 meskes Exp $ */
ECPG: stmtClosePortalStmt block ECPG: stmtClosePortalStmt block
{ {
if (INFORMIX_MODE) if (INFORMIX_MODE)
@ -106,10 +106,13 @@ ECPG: stmtViewStmt rule
| ECPGFree | ECPGFree
{ {
const char *con = connection ? connection : "NULL"; const char *con = connection ? connection : "NULL";
if (strcmp($1, "all"))
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1); if (!strcmp($1, "all"))
else
fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con); fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con);
else if ($1[0] == ':')
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1);
else
fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1);
whenever_action(2); whenever_action(2);
free($1); free($1);

4
src/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.22 2010/03/20 18:53:00 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.23 2010/03/21 11:56:45 meskes Exp $ */
statements: /*EMPTY*/ statements: /*EMPTY*/
| statements statement | statements statement
@ -966,7 +966,7 @@ execstring: char_variable
* the exec sql free command to deallocate a previously * the exec sql free command to deallocate a previously
* prepared statement * prepared statement
*/ */
ECPGFree: SQL_FREE name { $$ = $2; } ECPGFree: SQL_FREE cursor_name { $$ = $2; }
| SQL_FREE ALL { $$ = make_str("all"); } | SQL_FREE ALL { $$ = make_str("all"); }
; ;