diff options
| author | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
| commit | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (patch) | |
| tree | dfef7e73b3b19a65895651c82cb6e0b727394eab /activerecord/test/cases/helper.rb | |
| parent | a14cedc7797aef4ccd9da46ed73e36d730392814 (diff) | |
| parent | fc89a951933638b051bb1f9e1339ee6ae7c94cda (diff) | |
| download | rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.gz rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.bz2 rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.zip | |
merge with local tweaks
Diffstat (limited to 'activerecord/test/cases/helper.rb')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index dc83300efa..0530ba9bd9 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -32,13 +32,13 @@ end ActiveRecord::Base.connection.class.class_eval do IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/] - def execute_with_counting(sql, name = nil, &block) - $query_count ||= 0 - $query_count += 1 unless IGNORED_SQL.any? { |r| sql =~ r } - execute_without_counting(sql, name, &block) + def execute_with_query_record(sql, name = nil, &block) + $queries_executed ||= [] + $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r } + execute_without_query_record(sql, name, &block) end - alias_method_chain :execute, :counting + alias_method_chain :execute, :query_record end # Make with_scope public for tests |