From 49c8e006e2716299e8c3fe3909ec15688bab19b1 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Thu, 6 Aug 2026 19:13:26 +0100 Subject: [PATCH 1/2] Refactor insert returning: handling to take QueryIntent directly --- .../connection_adapters/sqlserver/database_statements.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index a3fbe0126..484f1331b 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -361,9 +361,10 @@ def newsequentialid_function protected + # TODO: convert to "def apply_returning_to!(intent, returning)". def sql_for_insert(sql, pk, binds, returning) if pk.nil? - table_name = query_requires_identity_insert?(sql) + table_name = query_requires_identity_insert?(sql) || get_table_name(sql) pk = schema_cache.primary_keys(table_name) end From f54084e869b76771a857624e0eb74875ae11d00b Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 7 Aug 2026 17:00:16 +0100 Subject: [PATCH 2/2] Remove comment --- .../connection_adapters/sqlserver/database_statements.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index 484f1331b..3dee61bc8 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -361,7 +361,6 @@ def newsequentialid_function protected - # TODO: convert to "def apply_returning_to!(intent, returning)". def sql_for_insert(sql, pk, binds, returning) if pk.nil? table_name = query_requires_identity_insert?(sql) || get_table_name(sql)