Handle leading spaces in the SQL #72
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| SQL_SLAVE_MATCHERS = [/^select\s/i].map(&:freeze).freeze | ||
| SQL_ALL_MATCHERS = [/^set\s/i].map(&:freeze).freeze | ||
| SQL_SKIP_STICKINESS_MATCHERS = [/^show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /^(set|describe|explain|pragma)\s/i].map(&:freeze).freeze | ||
| SQL_MASTER_MATCHERS = [/^\s*select.+for update$/i, /select.+lock in share mode$/i].map(&:freeze).freeze |
There was a problem hiding this comment.
There's a second regex here which should have the same matcher.
|
I'm pretty sure the failure on travis is due to a new rack version if you want to update the httponly bit as well. Looks good after that. |
|
I tweaked the spec file to expect the HttpOnly, but now Travis is giving errors "Gem::InstallError: pg requires Ruby version >= 1.9.3.". I didn't tweak the gemfile at all, so I'm not sure what's going on with that... both that and the spec issue seem outside the scope of the changes I made. :/ |
|
I'll take a look tomorrow. |
mnelson
added a commit
that referenced
this pull request
Feb 7, 2015
Handle leading spaces in the SQL
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In our project (postgres) the
needs_master?method and friends were being passing SQL with leading spaces, which didn't match the regex and so all queries ended up being routed to master.