Permalink
Browse files

moving ignored regexp to the instance

  • Loading branch information...
tenderlove committed Dec 8, 2011
1 parent 38a8f7f commit a505b1377422a1821798d060301c50abea6afbd4
Showing with 8 additions and 6 deletions.
  1. +8 −6 activerecord/test/cases/helper.rb
@@ -65,20 +65,22 @@ class SQLCounter
# ignored SQL. This ignored SQL is for Oracle.
ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
- cattr_accessor :ignored_sql_regexp
- self.ignored_sql_regexp = Regexp.union ignored_sql
-
cattr_accessor :log
self.log = []
+ attr_reader :ignore
+
+ def initialize(ignore = Regexp.union(self.class.ignored_sql))
+ @ignore = ignore
+ end
+
def call(name, start, finish, message_id, values)
sql = values[:sql]
# FIXME: this seems bad. we should probably have a better way to indicate
# the query was cached
- unless 'CACHE' == values[:name]
- self.class.log << sql unless self.class.ignored_sql_regexp =~ sql
- end
+ return if 'CACHE' == values[:name] || ignore =~ sql
+ self.class.log << sql
end
end

0 comments on commit a505b13

Please sign in to comment.