aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Toews <mastahyeti@gmail.com>2017-09-25 10:39:35 -0600
committerMatthew Draper <matthew@trebex.net>2017-11-09 22:37:23 +1030
commit65328025917f0b60d0fbbeca87f173f34d9c91c5 (patch)
treee7fd8c588a6d8eb7b5dd02d37bea69a46ff833f7
parent92e78593ee056bb73a7a87c10af3f2587eca1150 (diff)
downloadrails-65328025917f0b60d0fbbeca87f173f34d9c91c5.tar.gz
rails-65328025917f0b60d0fbbeca87f173f34d9c91c5.tar.bz2
rails-65328025917f0b60d0fbbeca87f173f34d9c91c5.zip
call enforce_raw_sql_whitelist on @klass so it works with FakeKlass
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 7fe0129b4a..f3b44d19d6 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -297,7 +297,7 @@ module ActiveRecord
# Same as #order but operates on relation in-place instead of copying.
def order!(*args) # :nodoc:
- enforce_raw_sql_whitelist(column_names_from_order_arguments(args))
+ @klass.enforce_raw_sql_whitelist(column_names_from_order_arguments(args))
preprocess_order_args(args)
self.order_values += args
@@ -320,7 +320,7 @@ module ActiveRecord
# Same as #reorder but operates on relation in-place instead of copying.
def reorder!(*args) # :nodoc:
- enforce_raw_sql_whitelist(column_names_from_order_arguments(args))
+ @klass.enforce_raw_sql_whitelist(column_names_from_order_arguments(args))
preprocess_order_args(args)
self.reordering_value = true