aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-13 17:31:19 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-13 17:31:19 -0300
commitb4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab (patch)
tree525dc7162b50a7f047c2adda76a813429594524c /activerecord/lib
parente50fe85180648be0c4216bd0111f05be1df0988a (diff)
parent929fcd26179f2b589d52f9515cbd349f1197ece9 (diff)
downloadrails-b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab.tar.gz
rails-b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab.tar.bz2
rails-b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab.zip
Merge pull request #19770 from vngrs/prevent_duplicated_where_clauses
Prevent duplicating `where` clauses
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/scoping/default.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb
index 3590b8846e..a1adf8e3ee 100644
--- a/activerecord/lib/active_record/scoping/default.rb
+++ b/activerecord/lib/active_record/scoping/default.rb
@@ -100,6 +100,7 @@ module ActiveRecord
end
def build_default_scope(base_rel = relation) # :nodoc:
+ return if abstract_class?
if !Base.is_a?(method(:default_scope).owner)
# The user has defined their own default scope method, so call that
evaluate_default_scope { default_scope }