Skip to content

Remove empty key value pairs when using advanced search hash #1653

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove empty key value pairs when using advanced search hash #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions lib/ransack/search.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ def initialize(object, params = {}, options = {})
params = params.dup
params = params.transform_values { |v| v.is_a?(String) && strip_whitespace ? v.strip : v }
params.delete_if { |k, v| [*v].all?{ |i| i.blank? && i != false } }
if params.key?(:c)
case params[:c]
when Array
params[:c].delete_if { |v| check_advanced_search_value? v }
when Hash
params[:c].delete_if { |_,v| check_advanced_search_value? v }
end
end
else
params = {}
end
Expand Down Expand Up @@ -191,5 +199,13 @@ def collapse_multiparameter_attributes!(attrs)
attrs
end

def check_advanced_search_value?(value)
case value[:v]
when Array
value[:v].all?{ |i| i.blank? && i != false }
when Hash
value[:v].all?{ |_,i| value[:value].blank? && value[:value] != false }
end
end
end
end
11 changes: 11 additions & 0 deletions spec/ransack/adapters/active_record/base_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,17 @@ def self.sane_adapter?
expect(s.result.to_sql).not_to match /LEFT OUTER JOIN/
end

it 'should remove empty key value pairs from the complex params hash' do
s = Person.ransack(
c: {
'0' => {
a: ['children_name'],
p: 'eq', v: ['']
}
})
expect(s.result.to_sql).not_to match /LEFT OUTER JOIN/
end

it 'should keep proper key value pairs in the params hash' do
s = Person.ransack(children_reversed_name_eq: 'Testing')
expect(s.result.to_sql).to match /LEFT OUTER JOIN/
Expand Down