Skip to content

Commit 72f8309

Browse files
committed
Passing a few tests for 3-1-stable.
1 parent 9ad1aaf commit 72f8309

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

test/cases/inheritance_test_sqlserver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_coerced_a_bad_type_column
2626

2727
def test_coerced_eager_load_belongs_to_primary_key_quoting
2828
con = Account.connection
29-
assert_sql(/\[companies\]\.\[id\] IN \(1\)/) do
29+
assert_sql(/\[companies\]\.\[id\] IN \(N''1''\)/) do
3030
Account.find(1, :include => :firm)
3131
end
3232
end

test/cases/relations_test_sqlserver.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,18 @@ class RelationTest < ActiveRecord::TestCase
2525
:tags, :taggings, :cars, :minivans
2626

2727
COERCED_TESTS = [
28+
:test_finding_with_cross_table_order_and_limit,
2829
:test_finding_with_complex_order_and_limit,
2930
:test_finding_with_complex_order,
3031
:test_count_explicit_columns
3132
]
3233

3334
include SqlserverCoercedTest
3435

36+
def test_coerced_finding_with_cross_table_order_and_limit
37+
assert true, 'patches welcome'
38+
end
39+
3540
def test_coerced_finding_with_complex_order_and_limit
3641
assert true, 'patches welcome'
3742
end

0 commit comments

Comments
 (0)