diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-08 10:17:37 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-08 10:20:14 -0800 |
| commit | d80e4ee20e690dfc0f4ec31c41b873d607462872 (patch) | |
| tree | 1aa872e1dec65da4bd36739643d6d200c0b1e867 /activerecord | |
| parent | 859a4556dd3374f893e0a756434dc41f0574fedf (diff) | |
| download | rails-d80e4ee20e690dfc0f4ec31c41b873d607462872.tar.gz rails-d80e4ee20e690dfc0f4ec31c41b873d607462872.tar.bz2 rails-d80e4ee20e690dfc0f4ec31c41b873d607462872.zip | |
Regexp.union seems to have different results in 1.8
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index b750a03fba..ae2c230d15 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -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 |