activerecord-sqlserver-adapter 8.0.5 → 8.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488cfb3fda58b07e4bacc2db733d766492f84d4d0af50ecd6e5548f066ac34b3
-  data.tar.gz: b64864d043dd035dde5413736d9fc9adb5d2bf1e364b25ef57ca2ea69bc386cf
+  metadata.gz: 55b3eb63b017029ece8397fb34c2eaf883b62e0ac96966e3655b384abd67f2f8
+  data.tar.gz: 235155e68ee4bc3843406f7ed776889c252abd2c95c684dbab5ed4d964fb1648
 SHA512:
-  metadata.gz: fe2eb7bbc39edbc855bba7403792e532a43cae178d1cd8943189142f61c4203b346cb0191366626422ec287fde5d77d174240bcdef37152d177acda8d1e5dad4
-  data.tar.gz: 88ae10b6aa5b67f2bbc6a760a2f5af7679422fea1d10086aa3bb6592aaeadc202a2657c48906e4bb8b237acd7ca87e57588de6f02590a20a32278c855777b5c8
+  metadata.gz: d2cc2806e29ffe9b3fc35f4ec0689f62b8c37927fb2733ca3b84ac0caaa3c7e7508bf7171d7d44b9e40c3634187b1850f5cc3471d6b332c69f4b39b550547181
+  data.tar.gz: 2bbcf53461556e7cb28462a37cf903d064cf9528129fb025a4c072dd95dca0dcbcbccf6b5f9bfc538bd032abf97fee942019060d4b738646f2c90bbffc9b17dd

data/.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   test:
     name: Run test suite
-    runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
+    runs-on: ubuntu-latest
 
     env:
       COMPOSE_FILE: compose.ci.yaml

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## v8.0.7
+
+#### Fixed
+
+- [#1334](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1334) Enable identity insert on view's base table for fixtures.
+- [#1339](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1339) Fix `insert_all`/`upsert_all` for table names containing numbers.
+
+## v8.0.6
+
+#### Fixed
+
+- [#1318](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1318) Reverse order of values when upserting
+- [#1321](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1321) Fix SQL statement to calculate `updated_at` when upserting
+
 ## v8.0.5
 
 #### Added

data/VERSION

@@ -1 +1 @@
-8.0.5
+8.0.7

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -15,9 +15,6 @@ module ActiveRecord
 
         def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
           result = if id_insert_table_name = query_requires_identity_insert?(sql)
-                     # If the table name is a view, we need to get the base table name for enabling identity insert.
-                     id_insert_table_name = view_table_name(id_insert_table_name) if view_exists?(id_insert_table_name)
-
                      with_identity_insert_enabled(id_insert_table_name, raw_connection) do
                        internal_exec_sql_query(sql, raw_connection)
                      end
@@ -159,6 +156,8 @@ module ActiveRecord
 
 
         def build_sql_for_merge_insert(insert:, insert_all:, columns_with_uniqueness_constraints:) # :nodoc:
+          insert_all.inserts.reverse! if insert.update_duplicates?
+
           sql = <<~SQL
             MERGE INTO #{insert.model.quoted_table_name} WITH (UPDLOCK, HOLDLOCK) AS target
             USING (
@@ -223,11 +222,14 @@ module ActiveRecord
         end
 
         def with_identity_insert_enabled(table_name, conn)
-          table_name = quote_table_name(table_name)
-          set_identity_insert(table_name, conn, true)
+          # If the table name is a view, we need to get the base table name for enabling identity insert.
+          table_name = view_table_name(table_name) if view_exists?(table_name)
+          quoted_table_name = quote_table_name(table_name)
+
+          set_identity_insert(quoted_table_name, conn, true)
           yield
         ensure
-          set_identity_insert(table_name, conn, false)
+          set_identity_insert(quoted_table_name, conn, false)
         end
 
         def use_database(database = nil)
@@ -583,7 +585,7 @@ module ActiveRecord
         def build_sql_for_recording_timestamps_when_updating(insert:)
           insert.model.timestamp_attributes_for_update_in_model.filter_map do |column_name|
             if insert.send(:touch_timestamp_attribute?, column_name)
-              "target.#{quote_column_name(column_name)}=CASE WHEN (#{insert.updatable_columns.map { |column| "(COALESCE(target.#{quote_column_name(column)}, 'NULL') = COALESCE(source.#{quote_column_name(column)}, 'NULL'))" }.join(" AND ")}) THEN target.#{quote_column_name(column_name)} ELSE #{high_precision_current_timestamp} END,"
+              "target.#{quote_column_name(column_name)}=CASE WHEN (#{insert.updatable_columns.map { |column| "(source.#{quote_column_name(column)} = target.#{quote_column_name(column)} OR (source.#{quote_column_name(column)} IS NULL AND target.#{quote_column_name(column)} IS NULL))" }.join(" AND ")}) THEN target.#{quote_column_name(column_name)} ELSE #{high_precision_current_timestamp} END,"
             end
           end.join
         end

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -721,7 +721,7 @@ module ActiveRecord
           elsif s.match?(/^\s*UPDATE\s+.*/i)
             s.match(/UPDATE\s+([^\(\s]+)\s*/i)[1]
           elsif s.match?(/^\s*MERGE INTO.*/i)
-            s.match(/^\s*MERGE\s+INTO\s+(\[?[a-z_ -]+\]?\.?\[?[a-z_ -]+\]?)\s+(AS|WITH|USING)/i)[1]
+            s.match(/^\s*MERGE\s+INTO\s+(\[?[a-z0-9_ -]+\]?\.?\[?[a-z0-9_ -]+\]?)\s+(AS|WITH|USING)/i)[1]
           else
             s.match(/FROM[\s|\(]+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
           end.strip

data/test/cases/insert_all_test_sqlserver.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "cases/helper_sqlserver"
+require "models/book"
+require "models/sqlserver/recurring_task"
+
+class InsertAllTestSQLServer < ActiveRecord::TestCase
+  # Test ported from the Rails `main` branch that is not on the `8-0-stable` branch.
+  def test_insert_all_only_applies_last_value_when_given_duplicate_identifiers
+    skip unless supports_insert_on_duplicate_skip?
+
+    Book.insert_all [
+                      { id: 111, name: "expected_new_name" },
+                      { id: 111, name: "unexpected_new_name" }
+                    ]
+    assert_equal "expected_new_name", Book.find(111).name
+  end
+
+  # Test ported from the Rails `main` branch that is not on the `8-0-stable` branch.
+  def test_upsert_all_only_applies_last_value_when_given_duplicate_identifiers
+    skip unless supports_insert_on_duplicate_update? && !current_adapter?(:PostgreSQLAdapter)
+
+    Book.create!(id: 112, name: "original_name")
+
+    Book.upsert_all [
+                      { id: 112, name: "unexpected_new_name" },
+                      { id: 112, name: "expected_new_name" }
+                    ]
+    assert_equal "expected_new_name", Book.find(112).name
+  end
+
+  test "upsert_all recording of timestamps works with mixed datatypes" do
+    task = RecurringTask.create!(
+      key: "abcdef",
+      priority: 5
+    )
+
+    RecurringTask.upsert_all([{
+                                id: task.id,
+                                priority: nil
+                              }])
+
+    assert_not_equal task.updated_at, RecurringTask.find(task.id).updated_at
+  end
+end

data/test/cases/schema_test_sqlserver.rb

@@ -118,6 +118,10 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
       it do
         assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "MERGE INTO [with].[select notation] AS target")
       end
+
+      it do
+        assert_equal "[with_numbers_1234]", connection.send(:get_raw_table_name, "MERGE INTO [with_numbers_1234] AS target")
+      end
     end
 
     describe 'CREATE VIEW statements' do

data/test/cases/view_test_sqlserver.rb

@@ -48,11 +48,17 @@ class ViewTestSQLServer < ActiveRecord::TestCase
     end
   end
 
-  describe 'identity insert' do
-    it "identity insert works with views" do
-      assert_difference("SSTestCustomersView.count", 1) do
+  describe "identity insert" do
+    it "creates table record through a view" do
+      assert_difference("SSTestCustomersView.count", 2) do
         SSTestCustomersView.create!(id: 5, name: "Bob")
+        SSTestCustomersView.create!(id: 6, name: "Tim")
       end
     end
+
+    it "creates table records through a view using fixtures" do
+      ActiveRecord::FixtureSet.create_fixtures(File.join(ARTest::SQLServer.test_root_sqlserver, "fixtures"), ["sst_customers_view"])
+      assert_equal SSTestCustomersView.all.count, 2
+    end
   end
 end

data/test/fixtures/sst_customers_view.yml

@@ -0,0 +1,6 @@
+david:
+  name: "David"
+  balance: 2,004
+aidan:
+  name: "Aidan"
+  balance: 10,191

data/test/models/sqlserver/recurring_task.rb

@@ -0,0 +1,3 @@
+class RecurringTask < ActiveRecord::Base
+  self.table_name = "recurring_tasks"
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -360,4 +360,12 @@ ActiveRecord::Schema.define do
       name varchar(255)
     )
   TABLE_IN_OTHER_SCHEMA_USED_BY_MODEL
+
+  create_table "recurring_tasks", force: true do |t|
+    t.string :key
+    t.integer :priority, default: 0
+
+    t.datetime2 :created_at
+    t.datetime2 :updated_at
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.5
+  version: 8.0.7
 platform: ruby
 authors:
 - Ken Collins
@@ -12,10 +12,9 @@ authors:
 - Joe Rafaniello
 - Tom Ward
 - Aidan Haran
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +163,7 @@ files:
 - test/cases/helper_sqlserver.rb
 - test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_test_sqlserver.rb
+- test/cases/insert_all_test_sqlserver.rb
 - test/cases/json_test_sqlserver.rb
 - test/cases/lateral_test_sqlserver.rb
 - test/cases/migration_test_sqlserver.rb
@@ -185,6 +185,7 @@ files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- test/fixtures/sst_customers_view.yml
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
@@ -205,6 +206,7 @@ files:
 - test/models/sqlserver/quoted_table.rb
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.rb
+- test/models/sqlserver/recurring_task.rb
 - test/models/sqlserver/sst_memory.rb
 - test/models/sqlserver/sst_string_collation.rb
 - test/models/sqlserver/string_default.rb
@@ -239,9 +241,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.5/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.5
-post_install_message:
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.7/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.7
 rdoc_options: []
 require_paths:
 - lib
@@ -256,8 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files:
@@ -283,6 +283,7 @@ test_files:
 - test/cases/helper_sqlserver.rb
 - test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_test_sqlserver.rb
+- test/cases/insert_all_test_sqlserver.rb
 - test/cases/json_test_sqlserver.rb
 - test/cases/lateral_test_sqlserver.rb
 - test/cases/migration_test_sqlserver.rb
@@ -304,6 +305,7 @@ test_files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- test/fixtures/sst_customers_view.yml
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
@@ -324,6 +326,7 @@ test_files:
 - test/models/sqlserver/quoted_table.rb
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.rb
+- test/models/sqlserver/recurring_task.rb
 - test/models/sqlserver/sst_memory.rb
 - test/models/sqlserver/sst_string_collation.rb
 - test/models/sqlserver/string_default.rb