From 8c2e7bcfd5ead33f6723ac1962fb0f96d7bf825a Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 6 Jan 2012 04:08:42 -0200 Subject: Revert "Add return for 1.8.7" This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25. There is no need for the return anymore, so reverting. --- activerecord/test/cases/relation_scoping_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index c65d073835..52dfea8fac 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -533,7 +533,7 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_default_scope_is_threadsafe if in_memory_db? - return skip "in memory db can't share a db between threads" + skip "in memory db can't share a db between threads" end threads = [] -- cgit v1.2.3 From a6a26702439ce5a73d5391a73d135c1b4d921663 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 6 Jan 2012 04:13:13 -0200 Subject: 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 :) --- activerecord/test/cases/helper.rb | 6 +++--- 1 file 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 -- cgit v1.2.3