Skip to content

Commit 5f43a2a

Browse files
committed
Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special case in assert_queries
1 parent b17fd25 commit 5f43a2a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

activerecord/lib/active_record/test_case.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ def assert_queries(num = 1)
4646
$queries_executed = []
4747
yield
4848
ensure
49-
%w{ BEGIN COMMIT }.each { |x| $queries_executed.delete(x) }
5049
assert_equal num, $queries_executed.size, "#{$queries_executed.size} instead of #{num} queries were executed.#{$queries_executed.size == 0 ? '' : "\nQueries:\n#{$queries_executed.join("\n")}"}"
5150
end
5251

activerecord/test/cases/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def with_active_record_default_timezone(zone)
5757

5858
module ActiveRecord
5959
class SQLCounter
60-
IGNORED_SQL = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/]
60+
IGNORED_SQL = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
6161

6262
# FIXME: this needs to be refactored so specific database can add their own
6363
# ignored SQL. This ignored SQL is for Oracle.

0 commit comments

Comments
 (0)