aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorBen Toews <mastahyeti@gmail.com>2017-10-12 11:48:48 -0600
committerMatthew Draper <matthew@trebex.net>2017-11-09 22:42:15 +1030
commitb76cc29865fb69389ffdb7bd9f8085aa86354f82 (patch)
treef546036743fc345ad94aebffab24a5b51821f074 /activerecord/test
parentc711a27d29a3201ff47751a1d788f1e634186dd3 (diff)
downloadrails-b76cc29865fb69389ffdb7bd9f8085aa86354f82.tar.gz
rails-b76cc29865fb69389ffdb7bd9f8085aa86354f82.tar.bz2
rails-b76cc29865fb69389ffdb7bd9f8085aa86354f82.zip
deal with Array arguments to #order
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 4c865ef965..a755a3ceeb 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -389,13 +389,13 @@ class RelationTest < ActiveRecord::TestCase
end
def test_finding_with_sanitized_order
- query = Tag.order(["field(id, ?)", [1, 3, 2]]).to_sql
+ query = Tag.order([Arel.sql("field(id, ?)"), [1, 3, 2]]).to_sql
assert_match(/field\(id, 1,3,2\)/, query)
- query = Tag.order(["field(id, ?)", []]).to_sql
+ query = Tag.order([Arel.sql("field(id, ?)"), []]).to_sql
assert_match(/field\(id, NULL\)/, query)
- query = Tag.order(["field(id, ?)", nil]).to_sql
+ query = Tag.order([Arel.sql("field(id, ?)"), nil]).to_sql
assert_match(/field\(id, NULL\)/, query)
end