Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add a list of regexes assert_queries skips in the ActiveRecord test s…

…uite. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4385 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 05a17dc6b57e77171976a009b331511eae95200f 1 parent f9cd92f
@technoweenie technoweenie authored
Showing with 7 additions and 1 deletion.
  1. +2 −0  activerecord/CHANGELOG
  2. +5 −1 activerecord/test/abstract_unit.rb
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Add a list of regexes assert_queries skips in the ActiveRecord test suite. [Rick]
+
* Fix the has_and_belongs_to_many #create doesn't populate the join for new records. Closes #3692 [josh@hasmanythrough.com]
* Provide Association Extensions access to the instance that the association is being accessed from.
View
6 activerecord/test/abstract_unit.rb
@@ -56,9 +56,13 @@ def current_adapter?(type)
ActiveRecord::Base.connection.class.class_eval do
cattr_accessor :query_count
+
+ # Array of regexes of queries that are not counted against query_count
+ @@ignore_list = [/^SELECT currval/]
+
alias_method :execute_without_query_counting, :execute
def execute_with_query_counting(sql, name = nil)
- self.query_count += 1
+ self.query_count += 1 unless @@ignore_list.any? { |r| sql =~ r }
execute_without_query_counting(sql, name)
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.