Cleanup

Author: aidanharan

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -7,17 +7,13 @@ module DatabaseStatements
         READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :dbcc, :explain, :save, :select, :set, :rollback, :waitfor, :use) # :nodoc:
         private_constant :READ_QUERY
 
-        # TODO: replace `internal_exec_query` by `perform_query`.
+        def write_query?(sql) # :nodoc:
+          !READ_QUERY.match?(sql)
+        rescue ArgumentError # Invalid encoding
+          !READ_QUERY.match?(sql.b)
+        end
 
         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
-
-
           result = if id_insert_table_name = query_requires_identity_insert?(sql)
                      with_identity_insert_enabled(id_insert_table_name, raw_connection) do
                        internal_exec_sql_query(sql, raw_connection)
@@ -31,103 +27,27 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
           result
         end
 
-        #
-        # def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false)
-        #   sql = transform_query(sql)
-        #
-        #   check_if_write_query(sql)
-        #   mark_transaction_written_if_write(sql)
-        #
-        #   unless without_prepared_statement?(binds)
-        #     types, params = sp_executesql_types_and_parameters(binds)
-        #     sql = sp_executesql_sql(sql, types, params, name)
-        #   end
-        #
-        #   log(sql, name, binds, async: async) do |notification_payload|
-        #     with_raw_connection do |conn|
-        #       result = if id_insert_table_name = query_requires_identity_insert?(sql)
-        #                  with_identity_insert_enabled(id_insert_table_name, conn) do
-        #                    internal_exec_sql_query(sql, conn)
-        #                  end
-        #                else
-        #                  internal_exec_sql_query(sql, conn)
-        #                end
-        #
-        #       verified!
-        #       notification_payload[:row_count] = result.count
-        #       result
-        #     end
-        #   end
-        # end
-
-
-        # Receive a native adapter result object and returns an ActiveRecord::Result object.
         def cast_result(raw_result)
           if raw_result.columns.empty?
             ActiveRecord::Result.empty
           else
             ActiveRecord::Result.new(raw_result.columns, raw_result.rows)
           end
-
-        # rescue => e
-        #   binding.pry
         end
 
-
-
         def affected_rows(raw_result)
-
           raw_result.first['AffectedRows']
-
-          # if raw_result.count == 1 && raw_result.first.key?('AffectedRows')
-          #   raw_result.first['AffectedRows']
-          # else
-          #   raw_result.count
-          # end
-
-        # rescue => e
-        #   binding.pry
-        end
-
-
-
-        def write_query?(sql) # :nodoc:
-          !READ_QUERY.match?(sql)
-        rescue ArgumentError # Invalid encoding
-          !READ_QUERY.match?(sql.b)
         end
 
-        # TODO: This method implemented in Rails.
-        # def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
-        #   log(sql, name, async: async) do |notification_payload|
-        #     with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
-        #       result = if id_insert_table_name = query_requires_identity_insert?(sql)
-        #                  with_identity_insert_enabled(id_insert_table_name, conn) { internal_raw_execute(sql, conn, perform_do: true) }
-        #                else
-        #                  internal_raw_execute(sql, conn, perform_do: true)
-        #                end
-        #       verified!
-        #       notification_payload[:row_count] = result
-        #       result
-        #     end
-        #   end
-        # 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)
           handle_to_names_and_values(handle, ar_result: true)
@@ -138,13 +58,11 @@ def internal_exec_sql_query(sql, conn)
         def exec_delete(sql, name = nil, binds = [])
           sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
           super(sql, name, binds)
-          # internal_execute(sql, name, binds).first['AffectedRows']
         end
 
         def exec_update(sql, name = nil, binds = [])
           sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
           super(sql, name, binds)
-          # internal_execute(sql, name, binds).first['AffectedRows']
         end
 
         def begin_db_transaction
@@ -531,7 +449,6 @@ def finish_statement_handle(handle)
         # TinyTDS returns false instead of raising an exception if connection fails.
         # Getting around this by raising an exception ourselves while PR
         # https://github.com/rails-sqlserver/tiny_tds/pull/469 is not released.
-        # TODO: Check if `perform_do` is needed.
         def internal_raw_execute(sql, raw_connection, perform_do: false)
           result = raw_connection.execute(sql)
           raise TinyTds::Error, "failed to execute statement" if result.is_a?(FalseClass)

lib/active_record/connection_adapters/sqlserver/showplan.rb

@@ -13,8 +13,8 @@ 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