kotovalexarian-likes-github
/
activerecord-hackery--ransack
mirror of https://github.com/activerecord-hackery/ransack.git
1
0
Fork 0
Code Releases Activity

Fix failing specs on local machine [fix #1023] 

Since the structure of Node returned by ActiveReocrd changed from 54de9b1,
the spec execution failed.

refs: 54de9b1e4f
This commit is contained in:
sinsoku 2019-05-19 02:22:47 +09:00
parent 5170f735d4
commit 6f1c180783
No known key found for this signature in database
GPG Key ID: 92BA66D80B19ADF2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ransack/adapters/active_record/context.rb
View File

@ -186,6 +186,8 @@ module Ransack
correlated_key = correlated_key.left.left
elsif correlated_key.is_a? Arel::Nodes::Equality
correlated_key = correlated_key.left
elsif correlated_key.is_a? Arel::Nodes::Grouping
correlated_key = join_root.right.expr.right.left
else
correlated_key
end

4
spec/ransack/search_spec.rb
View File

@ -238,9 +238,9 @@ module Ransack
real_query = remove_quotes_and_backticks(s.to_sql)
expect(real_query)
.to include "LEFT OUTER JOIN articles ON articles.person_id = people.id"
.to match(%r{LEFT OUTER JOIN articles ON (\('default_scope' = 'default_scope'\) AND )?articles.person_id = people.id})
expect(real_query)
.to include "LEFT OUTER JOIN articles articles_people ON articles_people.person_id = parents_people.id"
.to match(%r{LEFT OUTER JOIN articles articles_people ON (\('default_scope' = 'default_scope'\) AND )?articles_people.person_id = parents_people.id})
expect(real_query)
.to include "people.name = 'person_name_query'"
expect(real_query)