Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires SQLCounter which was moved to AR internal tests only.

activerecord/lib/active_record/test_case.rb

@@ -14,7 +14,7 @@ module ActiveRecord
     end
 
     def teardown
-      ActiveRecord::SQLCounter.log.clear
+      SQLCounter.log.clear
     end
 
     def cleanup_identity_map
@@ -30,5 +30,65 @@ module ActiveRecord
         assert_equal expected.to_s, actual.to_s, message
       end
     end
+
+    def assert_sql(*patterns_to_match)
+      SQLCounter.log = []
+      yield
+      SQLCounter.log
+    ensure
+      failed_patterns = []
+      patterns_to_match.each do |pattern|
+        failed_patterns << pattern unless SQLCounter.log.any?{ |sql| pattern === sql }
+      end
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
+    end
+
+    def assert_queries(num = 1)
+      SQLCounter.log = []
+      yield
+    ensure
+      assert_equal num, SQLCounter.log.size, "#{SQLCounter.log.size} instead of #{num} queries were executed.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
+    end
+
+    def assert_no_queries(&block)
+      prev_ignored_sql = SQLCounter.ignored_sql
+      SQLCounter.ignored_sql = []
+      assert_queries(0, &block)
+    ensure
+      SQLCounter.ignored_sql = prev_ignored_sql
+    end
+
   end
+
+  class SQLCounter
+    class << self
+      attr_accessor :ignored_sql, :log
+    end
+
+    self.log = []
+
+    self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
+
+    # FIXME: this needs to be refactored so specific database can add their own
+    # ignored SQL.  This ignored SQL is for Oracle.
+    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
+
+
+    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
+      return if 'CACHE' == values[:name] || ignore =~ sql
+      self.class.log << sql
+    end
+  end
+
+  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end

activerecord/test/cases/helper.rb

@@ -61,37 +61,6 @@ ensure
   ActiveRecord::Base.default_timezone = old_zone
 end
 
-module ActiveRecord
-  class SQLCounter
-    cattr_accessor :ignored_sql
-    self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
-
-    # FIXME: this needs to be refactored so specific database can add their own
-    # 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 :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
-      return if 'CACHE' == values[:name] || ignore =~ sql
-      self.class.log << sql
-    end
-  end
-
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
-end
-
 unless ENV['FIXTURE_DEBUG']
   module ActiveRecord::TestFixtures::ClassMethods
     def try_to_load_dependency_with_silence(*args)

activerecord/test/cases/test_case.rb

@@ -1,63 +1,10 @@
-require 'active_support/test_case'
+require 'active_support/deprecation'
+ActiveSupport::Deprecation.silence do
+  require 'active_record/test_case'
+end
 
-module ActiveRecord
-  # = Active Record Test Case
-  #
-  # Defines some test assertions to test against SQL queries.
-  class TestCase < ActiveSupport::TestCase #:nodoc:
-    setup :cleanup_identity_map
-
-    def setup
-      cleanup_identity_map
-    end
-
-    def teardown
-      ActiveRecord::SQLCounter.log.clear
-    end
-
-    def cleanup_identity_map
-      ActiveRecord::IdentityMap.clear
-    end
-
-    def assert_date_from_db(expected, actual, message = nil)
-      # SybaseAdapter doesn't have a separate column type just for dates,
-      # so the time is in the string and incorrectly formatted
-      if current_adapter?(:SybaseAdapter)
-        assert_equal expected.to_s, actual.to_date.to_s, message
-      else
-        assert_equal expected.to_s, actual.to_s, message
-      end
-    end
-
-    def assert_sql(*patterns_to_match)
-      ActiveRecord::SQLCounter.log = []
-      yield
-      ActiveRecord::SQLCounter.log
-    ensure
-      failed_patterns = []
-      patterns_to_match.each do |pattern|
-        failed_patterns << pattern unless ActiveRecord::SQLCounter.log.any?{ |sql| pattern === sql }
-      end
-      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
-    end
-
-    def assert_queries(num = 1)
-      ActiveRecord::SQLCounter.log = []
-      yield
-    ensure
-      assert_equal num, ActiveRecord::SQLCounter.log.size, "#{ActiveRecord::SQLCounter.log.size} instead of #{num} queries were executed.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
-    end
-
-    def assert_no_queries(&block)
-      prev_ignored_sql = ActiveRecord::SQLCounter.ignored_sql
-      ActiveRecord::SQLCounter.ignored_sql = []
-      assert_queries(0, &block)
-    ensure
-      ActiveRecord::SQLCounter.ignored_sql = prev_ignored_sql
-    end
-
-    def sqlite3? connection
-      connection.class.name.split('::').last == "SQLite3Adapter"
-    end
+ActiveRecord::TestCase.class_eval do
+  def sqlite3? connection
+    connection.class.name.split('::').last == "SQLite3Adapter"
   end
 end