Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed that options[:counter_sql] was overwritten with interpolated sq…

…l rather than original sql #355 [bitsweat]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@248 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit dbe8a26d7d22215054fc3630be95b81a16512fb8 1 parent 91eaeb2
@dhh dhh authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that options[:counter_sql] was overwritten with interpolated sql rather than original sql #355 [bitsweat]
+
* Fixed that overriding an attribute's accessor would be disregarded by add_on_empty and add_on_boundary_breaking because they simply used
the attributes[] hash instead of checking for @base.respond_to?(attr.to_s). [Marten]
View
3  activerecord/lib/active_record/associations/has_many_association.rb
@@ -14,7 +14,8 @@ def initialize(owner, association_name, association_class_name, association_clas
if options[:counter_sql]
@counter_sql = interpolate_sql(options[:counter_sql])
elsif options[:finder_sql]
- @counter_sql = options[:counter_sql] = @finder_sql.gsub(/SELECT (.*) FROM/i, "SELECT COUNT(*) FROM")
+ options[:counter_sql] = options[:finder_sql].gsub(/SELECT (.*) FROM/i, "SELECT COUNT(*) FROM")
+ @counter_sql = interpolate_sql(options[:counter_sql])
else
@counter_sql = "#{@association_class_primary_key_name} = #{@owner.quoted_id}#{@conditions ? " AND " + interpolate_sql(@conditions) : ""}"
end
Please sign in to comment.
Something went wrong with that request. Please try again.