From 6c36c369be0cdd8f5f5b47f77ba79d492db98f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
<rafaelmfranca@gmail.com>
Date: Sat, 17 Oct 2015 19:40:10 -0300
Subject: Revert "Move the handling of supported arguments to `where`"
This reverts commit 4d8f62dcfa0a5157b3facbd71f75fc6639636347.
Reason: This broke the build. Please recommit again when it is green.
---
activerecord/lib/active_record/relation/query_methods.rb | 2 ++
activerecord/lib/active_record/relation/where_clause_factory.rb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'activerecord')
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 55fd0e0b52..0dcecbd42d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -552,6 +552,8 @@ module ActiveRecord
WhereChain.new(spawn)
elsif opts.blank?
self
+ elsif !opts.is_a?(String) && !opts.respond_to?(:to_h)
+ raise ArgumentError, "Unsupported argument type: #{opts} (#{opts.class})"
else
spawn.where!(opts, *rest)
end
diff --git a/activerecord/lib/active_record/relation/where_clause_factory.rb b/activerecord/lib/active_record/relation/where_clause_factory.rb
index 9662756c2e..83ac074f97 100644
--- a/activerecord/lib/active_record/relation/where_clause_factory.rb
+++ b/activerecord/lib/active_record/relation/where_clause_factory.rb
@@ -21,7 +21,7 @@ module ActiveRecord
parts = predicate_builder.build_from_hash(attributes)
else
- raise ArgumentError, "Unsupported argument type: #{opts} (#{opts.class})"
+ parts = [opts]
end
WhereClause.new(parts, binds)
--
cgit v1.2.3