activerecord-sqlserver-adapter 7.2.5 → 7.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c48184b9fac12f23a4db11b01d1ed3d670fdd48f8c9705c690c830b622f11e
-  data.tar.gz: 9e88d43c701da66870643b33684c9a2b2d58db063e419789d0b7faf6c5cf2e15
+  metadata.gz: e4cecbb9e30775c962ac1ce665548b88081fc41501177c3e96abb3739d5d3c8a
+  data.tar.gz: 46b36bbe894e2023475765deebcb2b0ff38af31c6341aff3c56920d5bed77e00
 SHA512:
-  metadata.gz: 40567edb70c619f8b9ae007c41b9b1c05157862df8bb275494b1158648c87cad3971bc1d4080431696c623d48c42356cf826349b3cce36a762d9e7d68a0d3102
-  data.tar.gz: 162c65ce3cb0755f464798e0e55c651e72528f9e060c4dfd1d30ff8386fb54cbbe2f99c404f712a95c1567ec4892cc9833badcc73f8b4ce7469fdef8bdd2b039
+  metadata.gz: f978e149eb3c53fe1bd199fcbe533aef919dbbb6b076530e8a8d6e5e7dab9735a3f4ce98d3e27057ec2de18ba28c6a810b465f1b1525de14f75261226ca35b78
+  data.tar.gz: 8f30ad18a93884f2779d29850b19c2510c6a8c75455be38a25121912665355d799f2f1bb5d94664eb773b715ff45bb85e8244ec3afb4797f8dc5826b6c8f3f78

data/.github/workflows/ci.yml

@@ -5,7 +5,8 @@ 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
+    timeout-minutes: 10
 
     env:
       COMPOSE_FILE: docker-compose.ci.yml

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v7.2.7
+
+#### Changed
+
+- [#1341](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1341) Support more Azure services by changing language source.
+
+#### Fixed
+
+- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.
+
+## v7.2.6
+
+#### Fixed
+
+- [#1333](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1333) Enable identity insert on view's base table for fixtures.
+
 ## v7.2.5
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-7.2.5
+7.2.7

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

@@ -42,9 +42,6 @@ module ActiveRecord
           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)
-                         # 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, conn) do
                            internal_exec_sql_query(sql, conn)
                          end
@@ -194,11 +191,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)
@@ -228,7 +228,7 @@ module ActiveRecord
 
         def user_options_dateformat
           if sqlserver_azure?
-            select_value "SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID", "SCHEMA"
+            select_value "SELECT [dateformat] FROM [sys].[syslanguages] WHERE [name] = @@LANGUAGE", "SCHEMA"
           else
             user_options["dateformat"]
           end

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

@@ -571,6 +571,7 @@ module ActiveRecord
         end
 
         def column_definitions_sql(database, identifier)
+          database = "TEMPDB" if identifier.temporary_table?
           schema_name = "schema_name()"
 
           if prepared_statements
@@ -581,12 +582,8 @@ module ActiveRecord
             schema_name = quote(identifier.schema) if identifier.schema.present?
           end
 
-          object_id_arg = identifier.schema.present? ? "CONCAT(#{schema_name},'.',#{object_name})" : object_name
-
-          if identifier.temporary_table?
-            database = "TEMPDB"
-            object_id_arg = "CONCAT('#{database}','..',#{object_name})"
-          end
+          object_id_arg = identifier.schema.present? ? "CONCAT('.',#{schema_name},'.',#{object_name})" : "CONCAT('..',#{object_name})"
+          object_id_arg = "CONCAT('#{database}',#{object_id_arg})"
 
           %{
             SELECT

data/test/cases/adapter_test_sqlserver.rb

@@ -7,10 +7,17 @@ require "models/post"
 require "models/subscriber"
 require "models/minimalistic"
 require "models/college"
+require "models/dog"
+require "models/other_dog"
 
 class AdapterTestSQLServer < ActiveRecord::TestCase
   fixtures :tasks
 
+  let(:arunit_connection)  { Topic.lease_connection }
+  let(:arunit2_connection) { College.lease_connection }
+  let(:arunit_database)    { arunit_connection.pool.db_config.database }
+  let(:arunit2_database)   { arunit2_connection.pool.db_config.database }
+
   let(:basic_insert_sql) { "INSERT INTO [funny_jokes] ([name]) VALUES('Knock knock')" }
   let(:basic_update_sql) { "UPDATE [customers] SET [address_street] = NULL WHERE [id] = 2" }
   let(:basic_select_sql) { "SELECT * FROM [customers] WHERE ([customers].[id] = 1)" }
@@ -50,8 +57,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert Topic.table_exists?, "Topics table name of 'dbo.topics' should return true for exists."
 
       # Test when database and owner included in table name.
-      db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary")
-      Topic.table_name = "#{db_config.database}.dbo.topics"
+      Topic.table_name = "#{arunit_database}.dbo.topics"
       assert Topic.table_exists?, "Topics table name of '[DATABASE].dbo.topics' should return true for exists."
     ensure
       Topic.table_name = "topics"
@@ -59,12 +65,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   end
 
   it "test table existence across database schemas" do
-    arunit_connection = Topic.lease_connection
-    arunit2_connection = College.lease_connection
-
-    arunit_database = arunit_connection.pool.db_config.database
-    arunit2_database = arunit2_connection.pool.db_config.database
-
     # Assert that connections use different default databases schemas.
     assert_not_equal arunit_database, arunit2_database
 
@@ -200,6 +200,9 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       @identity_insert_sql_non_dbo_sp = "EXEC sp_executesql N'INSERT INTO [test].[aliens] ([id],[name]) VALUES (@0, @1)', N'@0 int, @1 nvarchar(255)', @0 = 420, @1 = N'Mork'"
       @identity_insert_sql_non_dbo_unquoted_sp = "EXEC sp_executesql N'INSERT INTO test.aliens (id, name) VALUES (@0, @1)', N'@0 int, @1 nvarchar(255)', @0 = 420, @1 = N'Mork'"
       @identity_insert_sql_non_dbo_unordered_sp = "EXEC sp_executesql N'INSERT INTO [test].[aliens] ([name],[id]) VALUES (@0, @1)', N'@0 nvarchar(255), @1  int', @0 = N'Mork', @1 = 420"
+
+      @non_identity_insert_sql_cross_database = "INSERT INTO #{arunit2_database}.dbo.dogs SELECT * FROM #{arunit_database}.dbo.dogs"
+      @identity_insert_sql_cross_database = "INSERT INTO #{arunit2_database}.dbo.dogs(id) SELECT id FROM #{arunit_database}.dbo.dogs"
     end
 
     it "return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column" do
@@ -216,20 +219,32 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal "[test].[aliens]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_non_dbo_sp)
       assert_equal "[test].[aliens]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_non_dbo_unquoted_sp)
       assert_equal "[test].[aliens]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_non_dbo_unordered_sp)
+
+      assert_equal "[#{arunit2_database}].[dbo].[dogs]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_cross_database)
     end
 
     it "return false to #query_requires_identity_insert? for normal SQL" do
-      [basic_insert_sql, basic_update_sql, basic_select_sql].each do |sql|
+      [basic_insert_sql, basic_update_sql, basic_select_sql, @non_identity_insert_sql_cross_database].each do |sql|
         assert !connection.send(:query_requires_identity_insert?, sql), "SQL was #{sql}"
       end
     end
 
-    it "find identity column using #identity_columns" do
+    it "find identity column" do
       task_id_column = Task.columns_hash["id"]
       assert_equal task_id_column.name, connection.send(:identity_columns, Task.table_name).first.name
       assert_equal task_id_column.sql_type, connection.send(:identity_columns, Task.table_name).first.sql_type
     end
 
+    it "find identity column cross database" do
+      id_column = Dog.columns_hash["id"]
+      assert_equal id_column.name, arunit2_connection.send(:identity_columns, Dog.table_name).first.name
+      assert_equal id_column.sql_type, arunit2_connection.send(:identity_columns, Dog.table_name).first.sql_type
+
+      id_column = OtherDog.columns_hash["id"]
+      assert_equal id_column.name, arunit_connection.send(:identity_columns, OtherDog.table_name).first.name
+      assert_equal id_column.sql_type, arunit_connection.send(:identity_columns, OtherDog.table_name).first.sql_type
+    end
+
     it "return an empty array when calling #identity_columns for a table_name with no identity" do
       _(connection.send(:identity_columns, Subscriber.table_name)).must_equal []
     end

data/test/cases/temp_test_sqlserver.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "cases/helper_sqlserver"
+
+class TempTestSQLServer < ActiveRecord::TestCase
+  # it "assert true" do
+  #   assert true
+  # end
+end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.5
+  version: 7.2.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-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -177,6 +176,7 @@ files:
 - test/cases/schema_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
+- test/cases/temp_test_sqlserver.rb
 - test/cases/temporary_table_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
@@ -186,6 +186,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
@@ -240,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/v7.2.5/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.2.5
-post_install_message:
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.2.7/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.2.7
 rdoc_options: []
 require_paths:
 - lib
@@ -257,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:
@@ -296,6 +295,7 @@ test_files:
 - test/cases/schema_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
+- test/cases/temp_test_sqlserver.rb
 - test/cases/temporary_table_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
@@ -305,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