Updated for Rails v7.1.0.rc2 (#1102)

Author: aidanharan

VERSION

@@ -1 +1 @@
-7.1.0.beta1
+7.1.0.rc2

activerecord-sqlserver-adapter.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 7.1.0.beta1"
+  spec.add_dependency "activerecord", "~> 7.1.0.rc2"
   spec.add_dependency "tiny_tds"
 end

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -308,7 +308,8 @@ def sql_for_insert(sql, pk, binds, _returning)
                 else
                   "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
                 end
-          super
+
+          [sql, binds]
         end
 
         # === SQLServer Specific ======================================== #

test/cases/coerced_tests.rb

@@ -2390,30 +2390,6 @@ def test_insert_all_returns_requested_sql_fields_coerced
     result = Book.insert_all! [{ name: "Rework", author_id: 1 }], returning: Arel.sql("UPPER(INSERTED.name) as name")
     assert_equal %w[ REWORK ], result.pluck("name")
   end
-
-  # SQL Server does not support upsert. Coerce can be removed after https://github.com/rails/rails/pull/49344
-  coerce_tests! :test_insert_all_should_handle_empty_arrays
-  def test_insert_all_should_handle_empty_arrays_coerced
-    assert_raises(ArgumentError, /does not support upsert/) do
-      original_test_insert_all_should_handle_empty_arrays
-    end
-  end
-
-  # SQL Server does not support upsert. Coerce can be removed after https://github.com/rails/rails/pull/49344
-  coerce_tests! :test_insert_all_and_upsert_all_with_aliased_attributes
-  def test_insert_all_and_upsert_all_with_aliased_attributes_coerced
-    assert_raises(ArgumentError, /does not support upsert/) do
-      original_test_insert_all_and_upsert_all_with_aliased_attributes
-    end
-  end
-
-  # SQL Server does not support upsert. Coerce can be removed after https://github.com/rails/rails/pull/49344
-  coerce_tests! :test_insert_all_and_upsert_all_with_sti
-  def test_insert_all_and_upsert_all_with_sti_coerced
-    assert_raises(ArgumentError, /does not support upsert/) do
-      original_test_insert_all_and_upsert_all_with_sti
-    end
-  end
 end
 
 class HasOneThroughDisableJoinsAssociationsTest < ActiveRecord::TestCase
@@ -2445,9 +2421,6 @@ class ActiveRecord::Encryption::EncryptableRecordTest < ActiveRecord::Encryption
     author = EncryptedAuthor.create(name: "a" * 4001)
     assert_not author.valid?
   end
-
-  # SQL Server does not support upsert. Coerce can be removed after https://github.com/rails/rails/pull/49344
-  coerce_tests! %r{loading records with encrypted attributes defined on columns with default values}
 end
 
 module ActiveRecord