Put analyze_keyword back in explain_option_name production.

tglsfdc · tglsfdc · commit 53eb83557853 · 2013-06-05T13:33:33.000-04:00
In commit 2c92eda, I broke "EXPLAIN (ANALYZE)" syntax, because I mistakenly thought that ANALYZE/ANALYSE were only partially reserved and thus would be included in NonReservedWord; but actually they're fully reserved so they still need to be called out here. A nicer solution would be to demote these words to type_func_name_keyword status (they can't be less than that because of "VACUUM [ANALYZE] ColId"). While that works fine so far as the core grammar is concerned, it breaks ECPG's grammar for reasons I don't have time to isolate at the moment. So do this for the time being. Per report from Kevin Grittner. Back-patch to 9.0, like the previous commit.
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -6980,6 +6980,7 @@ explain_option_elem:
 
 explain_option_name:
 			NonReservedWord			{ $$ = $1; }
+			| analyze_keyword		{ $$ = "analyze"; }
 		;
 
 explain_option_arg:

Original file line number	Diff line number	Diff line change
`@@ -6980,6 +6980,7 @@ explain_option_elem:`
`6980`	`6980`
`6981`	`6981`	`explain_option_name:`
`6982`	`6982`	`NonReservedWord { $$ = $1; }`
	`6983`	`+ \| analyze_keyword { $$ = "analyze"; }`
`6983`	`6984`	`;`
`6984`	`6985`
`6985`	`6986`	`explain_option_arg:`