diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-06 04:13:13 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-06 04:14:03 -0200 |
| commit | a6a26702439ce5a73d5391a73d135c1b4d921663 (patch) | |
| tree | 77238f7376641b9e975cc1f0b01ca1c9bb047a22 /activerecord | |
| parent | 8c2e7bcfd5ead33f6723ac1962fb0f96d7bf825a (diff) | |
| download | rails-a6a26702439ce5a73d5391a73d135c1b4d921663.tar.gz rails-a6a26702439ce5a73d5391a73d135c1b4d921663.tar.bz2 rails-a6a26702439ce5a73d5391a73d135c1b4d921663.zip | |
Revert "Regexp.union seems to have different results in 1.8"
This reverts commit d80e4ee20e690dfc0f4ec31c41b873d607462872.
No need to care about 1.8 anymore, so reverting :)
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 c05d588a54..adcfed56f9 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -72,8 +72,8 @@ module ActiveRecord attr_reader :ignore - def initialize(ignore = self.class.ignored_sql) - @ignore = ignore + def initialize(ignore = Regexp.union(self.class.ignored_sql)) + @ignore = ignore end def call(name, start, finish, message_id, values) @@ -81,7 +81,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.any? { |x| x =~ sql } + return if 'CACHE' == values[:name] || ignore =~ sql self.class.log << sql end end |