1 files changed, 14 insertions, 11 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index f96978aff8..739e2b2f19 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -119,21 +119,24 @@ class << Time
   end
 end
 
-module LogIntercepter
-  attr_accessor :logged, :intercepted
-  def self.extended(base)
-    base.logged = []
+class SQLSubscriber
+  attr_reader :logged
+  attr_reader :payloads
+
+  def initialize
+    @logged = []
+    @payloads = []
   end
-  def log(sql, name = 'SQL', binds = [], &block)
-    if @intercepted
-      @logged << [sql, name, binds]
-      yield
-    else
-      super(sql, name,binds, &block)
-    end
+
+  def start(name, id, payload)
+    @payloads << payload
+    @logged << [payload[:sql], payload[:name], payload[:binds]]
   end
+
+  def finish(name, id, payload); end
 end
 
+
 module InTimeZone
   private