Introduce Parameter Object: QueryIntent

Ref: rails/rails#55897

Author: aidanharan

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -13,10 +13,12 @@ def write_query?(sql) # :nodoc:
           !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)
-            sql = sp_executesql_sql(sql, types, params, notification_payload[:name])
+        def perform_query(raw_connection, intent)
+          sql = intent.processed_sql
+
+          unless intent.binds.nil? || intent.binds.empty?
+            types, params = sp_executesql_types_and_parameters(intent.binds)
+            sql = sp_executesql_sql(intent.processed_sql, types, params, intent.notification_payload[:name])
           end
 
           id_insert_table_name = query_requires_identity_insert?(sql)
@@ -30,8 +32,8 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
           end
 
           verified!
-          notification_payload[:affected_rows] = affected_rows
-          notification_payload[:row_count] = result.count
+          intent.notification_payload[:affected_rows] = affected_rows
+          intent.notification_payload[:row_count] = result.count
           result
         end
 
@@ -62,14 +64,34 @@ def internal_exec_sql_query(sql, conn)
           finish_statement_handle(handle)
         end
 
-        def exec_delete(sql, name = nil, binds = [])
-          sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
-          super
+        # Executes the delete statement and returns the number of rows affected.
+        def delete(arel, name = nil, binds = [])
+          intent = QueryIntent.new(arel: arel, name: name, binds: binds)
+
+          # Compile Arel to get SQL
+          compile_arel_in_intent(intent)
+
+          # Start of monkey-patch
+          sql = intent.processed_sql.present? ? intent.processed_sql : intent.raw_sql
+          intent.processed_sql = "#{sql}; SELECT @@ROWCOUNT AS AffectedRows"
+          # End of monkey-patch
+
+          affected_rows(raw_execute(intent))
         end
 
-        def exec_update(sql, name = nil, binds = [])
-          sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
-          super
+        # Executes the update statement and returns the number of rows affected.
+        def update(arel, name = nil, binds = [])
+          intent = QueryIntent.new(arel: arel, name: name, binds: binds)
+
+          # Compile Arel to get SQL
+          compile_arel_in_intent(intent)
+
+          # Start of monkey-patch
+          sql = intent.processed_sql.present? ? intent.processed_sql : intent.raw_sql
+          intent.processed_sql = "#{sql}; SELECT @@ROWCOUNT AS AffectedRows"
+          # End of monkey-patch
+
+          affected_rows(raw_execute(intent))
         end
 
         def begin_db_transaction
@@ -237,9 +259,11 @@ def execute_procedure(proc_name, *variables)
           end.join(", ")
           sql = "EXEC #{proc_name} #{vars}".strip
 
-          log(sql, "Execute Procedure") do |notification_payload|
+          intent = QueryIntent.new(processed_sql: sql)
+
+          log(intent, "Execute Procedure") do |notification_payload|
             with_raw_connection do |conn|
-              result = internal_raw_execute(sql, conn)
+              result = internal_raw_execute(intent.processed_sql, conn)
               verified!
               options = {as: :hash, cache_rows: true, timezone: ActiveRecord.default_timezone || :utc}
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -33,7 +33,8 @@ def drop_table(*table_names, **options)
 
         def indexes(table_name)
           data = begin
-            select("EXEC sp_helpindex #{quote(table_name)}", "SCHEMA")
+            intent = QueryIntent.new(raw_sql: "EXEC sp_helpindex #{quote(table_name)}", name: "SCHEMA")
+            select(intent)
           rescue
             []
           end

lib/active_record/connection_adapters/sqlserver/showplan.rb

@@ -30,8 +30,8 @@ def with_showplan_on
         end
 
         def set_showplan_option(enable = true)
-          sql = "SET #{showplan_option} #{enable ? "ON" : "OFF"}"
-          raw_execute(sql, "SCHEMA")
+          intent = QueryIntent.new(raw_sql: "SET #{showplan_option} #{enable ? "ON" : "OFF"}", name: "SCHEMA")
+          raw_execute(intent)
         rescue
           raise ActiveRecordError, "#{showplan_option} could not be turned #{enable ? "ON" : "OFF"}, perhaps you do not have SHOWPLAN permissions?"
         end