diff options
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 6 | ||||
| -rw-r--r-- | railties/CHANGELOG | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 0d72b9b0c5..9aed6af48b 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -24,8 +24,8 @@ module ActiveRecord if @options[:finder_sql] records = @association_class.find_by_sql(@finder_sql) else - sql = @finder_sql.dup - sql << " AND #{sanitize_sql(runtime_conditions)}" if runtime_conditions + sql = @finder_sql + sql += " AND #{sanitize_sql(runtime_conditions)}" if runtime_conditions orderings ||= @options[:order] records = @association_class.find_all(sql, orderings, limit, joins) end @@ -37,7 +37,7 @@ module ActiveRecord @association_class.count_by_sql(@finder_sql) else sql = @finder_sql - sql << " AND #{sanitize_sql(runtime_conditions)}" if runtime_conditions + sql += " AND #{sanitize_sql(runtime_conditions)}" if runtime_conditions @association_class.count(sql) end end diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f881dd07d5..a0a971cb37 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that association#count would produce invalid sql when called sequentialy #659 [kanis@comcard.de] + * Fixed test/mocks/testing to the correct test/mocks/test #740 * Added early failure if the Ruby version isn't 1.8.2 or above #735 |