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/lib/active_record/associations | |
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/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 108e316672..64e10f56e2 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -488,7 +488,7 @@ module ActiveRecord ensure_owner_is_persisted! transaction do - with_scope(:create => @scope[:create].merge(scoped.where_values_hash)) do + with_scope(:create => @scope[:create].merge(scoped.scope_for_create)) do build_record(attrs, &block) end end |