Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved GLOBAL, SESSION, and VARIABLES to non_reserved_keyword #3585

Merged
merged 2 commits into from
Jan 25, 2018
Merged

moved GLOBAL, SESSION, and VARIABLES to non_reserved_keyword #3585

merged 2 commits into from
Jan 25, 2018

Conversation

slanning
Copy link
Contributor

This also fixes an omission from b61debd
to remove the extra STATUS left in reserved_keyword .

I wasn't sure about GLOBAL and SESSION from my previous commit e5655b8 ,
so I left them for now but possibly they also should be in non_reserved_keyword.

(This is a second attempt at my botched PR #3577 ...)

This also fixes an omission from b61debd
to remove the extra STATUS left in reserved_keyword .

(I wasn't sure about GLOBAL and SESSION from my previous commit e5655b8 ,
so I left them for now but possibly they also should be in non_reserved_keyword.)
@bbeaudreault
Copy link
Contributor

In terms of your question around GLOBAL and SESSION, the general rule of thumb is to try non_reserved_keyword first. If it causes conflicts, put it in reserved_keyword. This is safe because we quote all the keywords anyway.

So if you're wondering I'd try moving GLOBAL/SESSION to non_reserved_keyword, and see if make returns any shift/reduce or reduce/reduce conflicts. If not, great! If so, just leave as is.

@slanning
Copy link
Contributor Author

Thanks for the feedback. I'll try that tomorrow. (I did have a shift-reduce conflict when making the original change, and it's quite possible that putting it in reserved_keyword is just a relic of an attempt at resolving that...)

@slanning slanning changed the title moved VARIABLES to non_reserved_keyword moved GLOBAL, SESSION, and VARIABLES to non_reserved_keyword Jan 25, 2018
@sougou
Copy link
Contributor

sougou commented Jan 25, 2018

LGTM

Approved with PullApprove

@sougou sougou merged commit 46af0b1 into vitessio:master Jan 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants