Removed outdated explain subscriber code.

Author: thirdshift

lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb

@@ -1,26 +1 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Sqlserver
-      module CoreExt
-        class ExplainSubscriber
-          def call(*args)
-            if queries = Thread.current[:available_queries_for_explain]
-              payload = args.last
-              queries << payload.values_at(:sql, :binds) unless ignore_sqlserver_payload?(payload)
-            end
-          end
-
-          IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
-          SQLSERVER_EXPLAINED_SQLS = /(select|update|delete|insert)/i
-
-          # TODO Need to modify the regex for the TSQL generated by this adapter so we can explain the proper sql statements
-          def ignore_sqlserver_payload?(payload)
-            payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) || payload[:sql] !~ SQLSERVER_EXPLAINED_SQLS
-          end
-
-          ActiveSupport::Notifications.subscribe("sql.active_record", new)
-        end
-      end
-    end
-  end
-end
+ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)/i

test/cases/showplan_test_sqlserver.rb

@@ -2,13 +2,13 @@
 require 'models/car'
 
 class ShowplanTestSqlserver < ActiveRecord::TestCase
-  
+
   fixtures :cars
-  
+
   context 'Unprepare previously prepared SQL' do
-    
+
     should 'from simple statement' do
-      plan = Car.where(id: 1).explain 
+      plan = Car.where(id: 1).explain
       assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1")
       assert plan.include?("Clustered Index Seek"), 'make sure we do not showplan the sp_executesql'
     end
@@ -18,81 +18,56 @@ class ShowplanTestSqlserver < ActiveRecord::TestCase
       assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE (\n id = 1 \n)")
       assert plan.include?("Clustered Index Seek"), 'make sure we do not showplan the sp_executesql'
     end
-    
+
     should 'from prepared statement ...' do
-      plan = capture_logger do
-        Car.where(:name => ',').limit(1).explain
-      end
+      plan = Car.where(:name => ',').limit(1).explain
       assert plan.include?("SELECT TOP (1) [cars].* FROM [cars] WHERE [cars].[name] = N','")
       assert plan.include?("TOP EXPRESSION"), 'make sure we do not showplan the sp_executesql'
       assert plan.include?("Clustered Index Scan"), 'make sure we do not showplan the sp_executesql'
     end
-    
+
   end
-  
+
   context 'With SHOWPLAN_TEXT option' do
-    
+
     should 'use simple table printer' do
       with_showplan_option('SHOWPLAN_TEXT') do
         plan = Car.where(:id => 1).explain
-        assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1") 
+        assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1")
         assert plan.include?("Clustered Index Seek"), 'make sure we do not showplan the sp_executesql'
       end
     end
-    
+
   end
-  
+
   context 'With SHOWPLAN_XML option' do
-    
+
     should 'show formatted xml' do
       with_showplan_option('SHOWPLAN_XML') do
         plan = Car.where(:id => 1).explain
         assert plan.include?('ShowPlanXML')
       end
     end
-    
+
   end
-  
-  
+
+
   private
-  
+
   def base
     ActiveRecord::Base
   end
 
   def connection
     base.connection
   end
-  
+
   def with_showplan_option(option)
     old_option = ActiveRecord::ConnectionAdapters::SQLServerAdapter.showplan_option
     ActiveRecord::ConnectionAdapters::SQLServerAdapter.showplan_option = option
     yield
   ensure
     ActiveRecord::ConnectionAdapters::SQLServerAdapter.showplan_option = old_option
   end
-  
-  
-  def capture_logger
-    original_logger = base.logger
-    log = StringIO.new
-    base.logger = Logger.new(log)
-    base.logger.level = Logger::WARN
-    yield
-    log.string
-  ensure
-    base.logger = original_logger
-  end
 
-  def capture_queries
-    queries = Thread.current[:available_queries_for_explain] = []
-    with_threshold(0) do
-      yield
-    end
-    queries
-  ensure
-    Thread.current[:available_queries_for_explain] = nil
-  end
-  
-  
 end