aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2015-11-02 13:04:45 +0000
committerAndrew White <pixeltrix@users.noreply.github.com>2015-11-02 13:04:45 +0000
commitc88cda58a9b12a99aa6593034e88f6e5b4e1efbc (patch)
treedb30db13d99ca844f1b818aa4328a96d3325b4c5 /activerecord/test/cases
parent57493eae3d45a4253aeb0b4f60239531da9d0446 (diff)
parent6011ab853c0b843e0aa139ca90a5e4ab9ec143c2 (diff)
downloadrails-c88cda58a9b12a99aa6593034e88f6e5b4e1efbc.tar.gz
rails-c88cda58a9b12a99aa6593034e88f6e5b4e1efbc.tar.bz2
rails-c88cda58a9b12a99aa6593034e88f6e5b4e1efbc.zip
Merge pull request #22133 from yui-knk/sanitize_sql_for_order
Define `sanitize_sql_for_order` for AR and use it inside `preprocess_…
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/relation/mutation_test.rb4
-rw-r--r--activerecord/test/cases/relation_test.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index cc0034ffd1..d0f60a84b5 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -22,6 +22,10 @@ module ActiveRecord
def sanitize_sql(sql)
sql
end
+
+ def sanitize_sql_for_order(sql)
+ sql
+ end
end
def relation
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 675149556f..8794bc8043 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -20,6 +20,10 @@ module ActiveRecord
def self.table_name
'fake_table'
end
+
+ def self.sanitize_sql_for_order(sql)
+ sql
+ end
end
def test_construction