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.

Sign up for GitHub

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

Fixes devils issue #666 #670

Closed
wants to merge 12 commits into from
Closed

Fixes devils issue #666 #670

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b602439
Merge branch 'release/2.1.3'
coorasse Jan 16, 2018
0e42c4e
Merge branch 'develop'
coorasse Jan 16, 2018
68772b4
Merge branch 'release/2.1.4'
coorasse Apr 9, 2018
4b1008e
Merge branch 'release/2.2.0'
coorasse Apr 15, 2018
1760baa
Merge branch 'release/2.3.0'
coorasse Sep 16, 2018
e10c3c9
Merge branch 'release/3.0.0'
coorasse Apr 3, 2019
61bfbc1
Merge branch 'release/3.0.1'
coorasse Apr 15, 2019
5ce3666
Merge branch 'release/3.0.2'
coorasse Jan 17, 2020
7bf836c
Merge branch 'release/3.1.0'
coorasse Mar 15, 2020
d56d79d
Add: wiki documentation into a separate docs folder (#621)
benkoshy May 14, 2020
d284e87
Revert "Add: wiki documentation into a separate docs folder (#621)" (…
coorasse May 14, 2020
a15985d
Fixes devils issue #666
diegosteiner Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/cancan/model_adapters/active_record_5_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ def sanitize_sql_activerecord5(conditions)
table_metadata = ActiveRecord::TableMetadata.new(@model_class, table)
predicate_builder = ActiveRecord::PredicateBuilder.new(table_metadata)

conditions = predicate_builder.resolve_column_aliases(conditions)

conditions.stringify_keys!
unless self.class.version_greater_or_equal?('6.1.0')
conditions = predicate_builder.resolve_column_aliases(conditions)
conditions.stringify_keys!
end

predicate_builder.build_from_hash(conditions).map { |b| visit_nodes(b) }.join(' AND ')
end
Expand Down