Merge pull request #29867 from koic/fix_a_failed_ar_test_when_using_oracle

Fix a failued AR test when using OracleAdapter
This commit is contained in:
Kasper Timm Hansen 2017-07-23 13:31:53 +02:00 committed by GitHub
commit cf36d1bf2f

@ -1594,7 +1594,11 @@ def test_automatically_added_order_references
assert_equal ["comments"], scope.references_values
scope = Post.order("#{Comment.quoted_table_name}.#{Comment.quoted_primary_key}")
assert_equal ["comments"], scope.references_values
if current_adapter?(:OracleAdapter)
assert_equal ["COMMENTS"], scope.references_values
else
assert_equal ["comments"], scope.references_values
end
scope = Post.order("comments.body", "yaks.body")
assert_equal ["comments", "yaks"], scope.references_values
@ -1615,7 +1619,11 @@ def test_automatically_added_reorder_references
assert_equal %w(comments), scope.references_values
scope = Post.reorder("#{Comment.quoted_table_name}.#{Comment.quoted_primary_key}")
assert_equal ["comments"], scope.references_values
if current_adapter?(:OracleAdapter)
assert_equal ["COMMENTS"], scope.references_values
else
assert_equal ["comments"], scope.references_values
end
scope = Post.reorder("comments.body", "yaks.body")
assert_equal %w(comments yaks), scope.references_values