aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/test_case.rb
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2019-05-07 04:29:53 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2019-05-08 00:21:31 +0900
commit6a32e8aa72ebcbd587d7845cf354724bf2fffd7b (patch)
tree40ee791b9552b22957a040306d755012bc5ace0d /activerecord/test/cases/test_case.rb
parentcecbc2340abec0ba96db9394f397f1e5a67c449d (diff)
downloadrails-6a32e8aa72ebcbd587d7845cf354724bf2fffd7b.tar.gz
rails-6a32e8aa72ebcbd587d7845cf354724bf2fffd7b.tar.bz2
rails-6a32e8aa72ebcbd587d7845cf354724bf2fffd7b.zip
Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log name
This commit adds "TRANSACTION" to savepoint and commit, rollback statements because none of savepoint statements were removed by #36153 since they are not "SCHEMA" statements. Although, only savepoint statements can be labeled as "TRANSACTION" I think all of transaction related method should add this label. Follow up #36153
Diffstat (limited to 'activerecord/test/cases/test_case.rb')
-rw-r--r--activerecord/test/cases/test_case.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 78dc0a6d9f..81f7226718 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -107,20 +107,12 @@ module ActiveRecord
clear_log
- self.ignored_sql = [/^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/]
-
- attr_reader :ignore
-
- def initialize(ignore = Regexp.union(self.class.ignored_sql))
- @ignore = ignore
- end
-
def call(name, start, finish, message_id, values)
return if values[:cached]
sql = values[:sql]
self.class.log_all << sql
- self.class.log << sql unless values[:name] == "SCHEMA" || ignore.match?(sql)
+ self.class.log << sql unless ["SCHEMA", "TRANSACTION"].include? values[:name]
end
end