diff options
| author | Michael Meskes <meskes@postgresql.org> | 2017-08-14 11:29:34 +0200 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2017-08-16 13:30:20 +0200 |
| commit | 60b135c8262bd7d1d115de1797165a437a890a7a (patch) | |
| tree | 12c4799f0f4c1d990a1ed8bc2268c82276221985 | |
| parent | 98e6784aa5b1a316c19d58c7b53f106936aca5e7 (diff) | |
| download | postgresql-60b135c8262bd7d1d115de1797165a437a890a7a.tar.gz postgresql-60b135c8262bd7d1d115de1797165a437a890a7a.zip | |
Changed ecpg parser to allow RETURNING clauses without attached C variables.
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.trailer | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.type | 1 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/parse.pl | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 81945fce71c..da065d1290c 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -1873,9 +1873,8 @@ Iresult: Iconst { $$ = $1; } ; execute_rest: /* EMPTY */ { $$ = EMPTY; } - | ecpg_using ecpg_into { $$ = EMPTY; } + | ecpg_using opt_ecpg_into { $$ = EMPTY; } | ecpg_into ecpg_using { $$ = EMPTY; } - | ecpg_using { $$ = EMPTY; } | ecpg_into { $$ = EMPTY; } ; @@ -1883,6 +1882,10 @@ ecpg_into: INTO into_list { $$ = EMPTY; } | into_descriptor { $$ = $1; } ; +opt_ecpg_into: /* EMPTY */ { $$ = EMPTY; } + | ecpg_into { $$ = $1; } + ; + ecpg_fetch_into: ecpg_into { $$ = $1; } | using_descriptor { diff --git a/src/interfaces/ecpg/preproc/ecpg.type b/src/interfaces/ecpg/preproc/ecpg.type index ac6aa000ac2..9497b91b9db 100644 --- a/src/interfaces/ecpg/preproc/ecpg.type +++ b/src/interfaces/ecpg/preproc/ecpg.type @@ -78,6 +78,7 @@ %type <str> opt_bit_field %type <str> opt_connection_name %type <str> opt_database_name +%type <str> opt_ecpg_into %type <str> opt_ecpg_fetch_into %type <str> opt_ecpg_using %type <str> opt_initializer diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl index 5335ac136ad..96b20566771 100644 --- a/src/interfaces/ecpg/preproc/parse.pl +++ b/src/interfaces/ecpg/preproc/parse.pl @@ -94,7 +94,7 @@ my %replace_line = ( 'VariableShowStmtSHOWSESSIONAUTHORIZATION' => 'SHOW SESSION AUTHORIZATION ecpg_into', 'returning_clauseRETURNINGtarget_list' => - 'RETURNING target_list ecpg_into', + 'RETURNING target_list opt_ecpg_into', 'ExecuteStmtEXECUTEnameexecute_param_clause' => 'EXECUTE prepared_name execute_param_clause execute_rest', 'ExecuteStmtCREATEOptTempTABLEcreate_as_targetASEXECUTEnameexecute_param_clause' |