Cast all search queries to text. #1079
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
lib/administrate/search.rb
Outdated
| @@ -24,7 +24,7 @@ def query | |||
| table_name = ActiveRecord::Base.connection. | |||
| quote_table_name(@scoped_resource.table_name) | |||
| attr_name = ActiveRecord::Base.connection.quote_column_name(attr) | |||
| "lower(#{table_name}.#{attr_name}) LIKE ?" | |||
| "lower(text(#{table_name}.#{attr_name})) LIKE ?" | |||
There was a problem hiding this comment.
We are writing the SQL keyword LIKE in all caps, how would you feel about doing LOWER and TEXT in all caps as well? I do this in my SQL style so that keywords and column names are clearly separated.
There was a problem hiding this comment.
Ah yeah, nice. I'll do that, it's much nicer.
spec/lib/administrate/search_spec.rb
Outdated
| "lower(\"users\".\"name\") LIKE ?"\ | ||
| " OR lower(\"users\".\"email\") LIKE ?", | ||
| "lower(text(\"users\".\"name\")) LIKE ?"\ | ||
| " OR lower(text(\"users\".\"email\")) LIKE ?", |
There was a problem hiding this comment.
Same here, we write OR and LIKE in caps, but not LOWER or TEXT.
nickcharlton
force-pushed
the
nc-postgres-compat
branch
from
993e16f to
4dc9afc
Compare
All Postgres versions since 8.4 require this to be a string. This casts the table and column to be strings as it's possible that the column name is nil. Fixes #620.
nickcharlton
force-pushed
the
nc-postgres-compat
branch
from
4dc9afc to
4a103e6
Compare
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.
All Postgres versions since 8.4 require this to be a string. This casts
the table and column to be strings as it's possible that the column name
is nil.
Fixes #620.