Changed ecpg parser to allow RETURNING clauses without attached C variables.

Michael Meskes · Michael Meskes · commit f8bc6b2f689d · 2017-08-16T13:30:09.000+02:00
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1873,16 +1873,19 @@ 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; }
 	;
 
 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
@@ -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
@@ -94,7 +94,7 @@
 	'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'

Original file line number	Diff line number	Diff line change
`@@ -1873,16 +1873,19 @@ Iresult: Iconst { $$ = $1; }`
`1873`	`1873`	`;`
`1874`	`1874`
`1875`	`1875`	`execute_rest: /* EMPTY */ { $$ = EMPTY; }`
`1876`		`- \| ecpg_using ecpg_into { $$ = EMPTY; }`
	`1876`	`+ \| ecpg_using opt_ecpg_into { $$ = EMPTY; }`
`1877`	`1877`	`\| ecpg_into ecpg_using { $$ = EMPTY; }`
`1878`		`- \| ecpg_using { $$ = EMPTY; }`
`1879`	`1878`	`\| ecpg_into { $$ = EMPTY; }`
`1880`	`1879`	`;`
`1881`	`1880`
`1882`	`1881`	`ecpg_into: INTO into_list { $$ = EMPTY; }`
`1883`	`1882`	`\| into_descriptor { $$ = $1; }`
`1884`	`1883`	`;`
`1885`	`1884`
	`1885`	`+opt_ecpg_into: /* EMPTY */ { $$ = EMPTY; }`
	`1886`	`+ \| ecpg_into { $$ = $1; }`
	`1887`	`+ ;`
	`1888`	`+`
`1886`	`1889`	`ecpg_fetch_into: ecpg_into { $$ = $1; }`
`1887`	`1890`	`\| using_descriptor`
`1888`	`1891`	`{`