Do not wrap EXPLAIN SQL in sp_executesql

Author: aidanharan

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -10,12 +10,12 @@ module DatabaseStatements
         # TODO: replace `internal_exec_query` by `perform_query`.
 
         def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
-          unless binds.nil? || binds.empty?
-            types, params = sp_executesql_types_and_parameters(binds)
-
-            # TODO: `name` parameter does not exist.
-            sql = sp_executesql_sql(sql, types, params)
-          end
+          # unless binds.nil? || binds.empty?
+          #   types, params = sp_executesql_types_and_parameters(binds)
+          #
+          #   # TODO: `name` parameter does not exist.
+          #   sql = sp_executesql_sql(sql, types, params)
+          # end
 
 
           result = if id_insert_table_name = query_requires_identity_insert?(sql)
@@ -73,6 +73,8 @@ def cast_result(raw_result)
         #   binding.pry
         end
 
+
+
         def affected_rows(raw_result)
 
           raw_result.first['AffectedRows']
@@ -112,6 +114,19 @@ def write_query?(sql) # :nodoc:
         # end
 
 
+        def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
+
+          unless binds.nil? || binds.empty?
+            types, params = sp_executesql_types_and_parameters(binds)
+
+
+            sql = sp_executesql_sql(sql, types, params, name)
+          end
+
+
+          super
+        end
+
 
         def internal_exec_sql_query(sql, conn)
           handle = internal_raw_execute(sql, conn)
@@ -425,19 +440,20 @@ def basic_attribute_type?(type)
             type.is_a?(NilClass)
         end
 
-        # TODO: `name` was removed from the method signature.
-        def sp_executesql_sql(sql, types, params)
-          # if name == "EXPLAIN"
-          #   params.each.with_index do |param, index|
-          #     substitute_at_finder = /(@#{index})(?=(?:[^']|'[^']*')*$)/ # Finds unquoted @n values.
-          #     sql = sql.sub substitute_at_finder, param.to_s
-          #   end
-          # else
+
+        def sp_executesql_sql(sql, types, params, name)
+          if name == "EXPLAIN"
+            params.each.with_index do |param, index|
+              substitute_at_finder = /(@#{index})(?=(?:[^']|'[^']*')*$)/ # Finds unquoted @n values.
+              sql = sql.sub substitute_at_finder, param.to_s
+            end
+          else
             types = quote(types.join(", "))
             params = params.map.with_index { |p, i| "@#{i} = #{p}" }.join(", ") # Only p is needed, but with @i helps explain regexp.
             sql = "EXEC sp_executesql #{quote(sql)}"
             sql += ", #{types}, #{params}" unless params.empty?
-          # end
+          end
+
           sql.freeze
         end
 

lib/active_record/connection_adapters/sqlserver/showplan.rb

@@ -13,9 +13,10 @@ module Showplan
         OPTIONS = [OPTION_ALL, OPTION_TEXT, OPTION_XML]
 
         def explain(arel, binds = [], options = [])
-          sql = to_sql(arel)
-          result = with_showplan_on { internal_exec_query(sql, "EXPLAIN", binds) }
+          sql     = to_sql(arel)
+          result  = with_showplan_on { internal_exec_query(sql, "EXPLAIN", binds) }
           printer = showplan_printer.new(result)
+
           printer.pp
         end