aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-30 14:28:29 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-30 14:28:29 -0800
commitf64c50a092394917ad9a79abc563aa2bef22ce94 (patch)
tree864d96082f472e60cbad1afd503fe507cf6dd2e6 /activerecord/lib/active_record
parent27aedeeb0bb9350d653f40d7023dd095be5eb24e (diff)
parentabc19c37aea561e7b087cee9d60c5698483f3136 (diff)
downloadrails-f64c50a092394917ad9a79abc563aa2bef22ce94.tar.gz
rails-f64c50a092394917ad9a79abc563aa2bef22ce94.tar.bz2
rails-f64c50a092394917ad9a79abc563aa2bef22ce94.zip
Merge pull request #13859 from huoxito/let-it-go
Let `unscope` ignore non Arel scope.where_values
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 14470f22aa..860063426a 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -883,8 +883,6 @@ module ActiveRecord
when Arel::Nodes::In, Arel::Nodes::NotIn, Arel::Nodes::Equality, Arel::Nodes::NotEqual
subrelation = (rel.left.kind_of?(Arel::Attributes::Attribute) ? rel.left : rel.right)
subrelation.name == target_value
- else
- raise "unscope(where: #{target_value.inspect}) failed: unscoping #{rel.class} \"#{rel}\" is unimplemented."
end
end