Regexp.union seems to have different results in 1.8

This commit is contained in:
Aaron Patterson
2011-12-08 10:17:37 -08:00
parent 859a4556dd
commit d80e4ee20e

View File

@@ -70,8 +70,8 @@ module ActiveRecord
attr_reader :ignore
def initialize(ignore = Regexp.union(self.class.ignored_sql))
@ignore = ignore
def initialize(ignore = self.class.ignored_sql)
@ignore = ignore
end
def call(name, start, finish, message_id, values)
@@ -79,7 +79,7 @@ module ActiveRecord
# FIXME: this seems bad. we should probably have a better way to indicate
# the query was cached
return if 'CACHE' == values[:name] || ignore =~ sql
return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
self.class.log << sql
end
end