diff options
author | Jon Leighton <j@jonathanleighton.com> | 2010-12-31 10:43:42 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-31 20:00:44 +0000 |
commit | 62b084f80759300f10a4e5c4235bf1d13693a7d3 (patch) | |
tree | 6eda5936f42ce5a14404edd8aa4823587b2bb3c4 /activerecord/test/cases | |
parent | 2bf31868033c50d71d6d68c1ddad67147908adc4 (diff) | |
download | rails-62b084f80759300f10a4e5c4235bf1d13693a7d3.tar.gz rails-62b084f80759300f10a4e5c4235bf1d13693a7d3.tar.bz2 rails-62b084f80759300f10a4e5c4235bf1d13693a7d3.zip |
Specify the STI type condition using SQL IN rather than a whole load of ORs. Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/relation_scoping_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index e8672515fc..7c6899d438 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -485,4 +485,11 @@ class DefaultScopingTest < ActiveRecord::TestCase posts_offset_limit = Post.offset(2).limit(3) assert_equal posts_limit_offset, posts_offset_limit end + + def test_create_with_merge + aaron = (PoorDeveloperCalledJamis.create_with(:name => 'foo', :salary => 20) & + PoorDeveloperCalledJamis.create_with(:name => 'Aaron')).new + assert_equal 20, aaron.salary + assert_equal 'Aaron', aaron.name + end end |