Skip to content

Commit 5682299

Browse files
committed
Rails2.3 - Coerce NestedScopingTest#test_merged_scoped_find to use correct regexp for adapter.
1 parent be59051 commit 5682299

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
MASTER
33

4+
* Rails2.3 - Coerce NestedScopingTest#test_merged_scoped_find to use correct regexp for adapter. [Ken Collins]
5+
46
* Rails2.3 - Implement a custom ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation#aliased_table_name_for
57
method that uses a Regexp.escape so that table/column quoting does not get ignored. [Ken Collins]
68

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
require 'cases/sqlserver_helper'
2+
require 'models/developer'
3+
4+
class MethodScopingTestSqlServer < ActiveRecord::TestCase
5+
end
6+
7+
class NestedScopingTest < ActiveRecord::TestCase
8+
9+
COERCED_TESTS = [:test_merged_scoped_find]
10+
11+
include SqlserverCoercedTest
12+
13+
fixtures :developers
14+
15+
def test_coerced_test_merged_scoped_find
16+
poor_jamis = developers(:poor_jamis)
17+
Developer.with_scope(:find => { :conditions => "salary < 100000" }) do
18+
Developer.with_scope(:find => { :offset => 1, :order => 'id asc' }) do
19+
assert_sql /ORDER BY id ASC/ do
20+
assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
21+
end
22+
end
23+
end
24+
end
25+
26+
end
27+
28+

0 commit comments

Comments
 (0)