Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6971 from dmathieu/empty_hash

fix querying with an empty hash
  • Loading branch information...
commit 5dc5560090d366e14265d1283e5027d8eaa48fc0 2 parents bf4c8fe + 30a576f
@rafaelfranca rafaelfranca authored
View
2  activerecord/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Fix querying with an empty hash *Damien Mathieu*
+
* Fix creation of through association models when using `collection=[]`
on a `has_many :through` association from an unsaved model.
Fix #7661.
View
8 activerecord/lib/active_record/relation/predicate_builder.rb
@@ -10,8 +10,12 @@ def self.build_from_hash(klass, attributes, default_table)
table = Arel::Table.new(column, default_table.engine)
association = klass.reflect_on_association(column.to_sym)
- value.each do |k, v|
- queries.concat expand(association && association.klass, table, k, v)
+ if value.empty?
+ queries.concat ['1 = 2']
+ else
+ value.each do |k, v|
+ queries.concat expand(association && association.klass, table, k, v)
+ end
end
else
column = column.to_s
View
11 activerecord/test/cases/relation/where_test.rb
@@ -4,10 +4,11 @@
require 'models/treasure'
require 'models/post'
require 'models/comment'
+require 'models/edge'
module ActiveRecord
class WhereTest < ActiveRecord::TestCase
- fixtures :posts
+ fixtures :posts, :edges
def test_belongs_to_shallow_where
author = Author.new
@@ -76,5 +77,13 @@ def test_where_with_table_name
post = Post.first
assert_equal post, Post.where(:posts => { 'id' => post.id }).first
end
+
+ def test_where_with_table_name_and_empty_hash
+ assert_equal 0, Post.where(:posts => {}).count
+ end
+
+ def test_where_with_empty_hash_and_no_foreign_key
+ assert_equal 0, Edge.where(:sink => {}).count
+ end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.