diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-08-05 21:18:12 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-08-05 21:18:12 +0000 |
| commit | 5779deb88d3dae9658cdd508dbde079acd68c2fb (patch) | |
| tree | 8694d839700008da729ff774d9fb5012317afa83 /activerecord/test | |
| parent | c99df461f45c514d434a6f0bcb368320b71fd0c8 (diff) | |
| download | rails-5779deb88d3dae9658cdd508dbde079acd68c2fb.tar.gz rails-5779deb88d3dae9658cdd508dbde079acd68c2fb.tar.bz2 rails-5779deb88d3dae9658cdd508dbde079acd68c2fb.zip | |
Refactored select routing for SQL Server adapter (closes #5683) [tom@popdog.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
| -rwxr-xr-x | activerecord/test/abstract_unit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb index 4628293449..f30e190fc9 100755 --- a/activerecord/test/abstract_unit.rb +++ b/activerecord/test/abstract_unit.rb @@ -60,12 +60,12 @@ 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/, /^SELECT CAST/] + @@ignore_list = [/^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/] alias_method :execute_without_query_counting, :execute - def execute_with_query_counting(sql, name = nil) + def execute_with_query_counting(sql, name = nil, &block) self.query_count += 1 unless @@ignore_list.any? { |r| sql =~ r } - execute_without_query_counting(sql, name) + execute_without_query_counting(sql, name, &block) end end |