activerecord-sqlserver-adapter 8.0.7 → 8.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b3eb63b017029ece8397fb34c2eaf883b62e0ac96966e3655b384abd67f2f8
-  data.tar.gz: 235155e68ee4bc3843406f7ed776889c252abd2c95c684dbab5ed4d964fb1648
+  metadata.gz: 10e87da3715b8059e900f1ecf18af7cd8b0a03ce48b2bd7e79399c4dacba6cfb
+  data.tar.gz: fb175a99c32dcfc1ad7fac35ab53086b97bf75a5e6f6d113ba031a20d4b38ede
 SHA512:
-  metadata.gz: d2cc2806e29ffe9b3fc35f4ec0689f62b8c37927fb2733ca3b84ac0caaa3c7e7508bf7171d7d44b9e40c3634187b1850f5cc3471d6b332c69f4b39b550547181
-  data.tar.gz: 2bbcf53461556e7cb28462a37cf903d064cf9528129fb025a4c072dd95dca0dcbcbccf6b5f9bfc538bd032abf97fee942019060d4b738646f2c90bbffc9b17dd
+  metadata.gz: e8319785b8064c84b42848ada06ddcd67e3318b6566f44c6339ad5037a18c5e409ed88d23d11f995220c1ccc34d8aff7af8b95b2c50235e36e279577de801323
+  data.tar.gz: c33591032fc453c2dad5b2acfd0aa83f5e13816291b0c5a867df1eb192c41b9f73e143c1347702b24e99e792c8c060f225958e78e9c6b032ba239277323da93a

data/.github/workflows/ci.yml

@@ -6,6 +6,7 @@ jobs:
   test:
     name: Run test suite
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     env:
       COMPOSE_FILE: compose.ci.yaml

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v8.0.8
+
+#### Changed
+
+- [#1342](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1342) Support more Azure services by changing language source.
+
+#### Fixed
+- [#1345](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1345) Maintain index options during `change_column` operations.
+- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.
+
 ## v8.0.7
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-8.0.7
+8.0.8

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

@@ -259,7 +259,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

@@ -182,12 +182,14 @@ module ActiveRecord
             sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name, column_name)} DEFAULT #{default} FOR #{quote_column_name(column_name)}"
           end
 
+          sql_commands.each { |c| execute(c) }
+
           # Add any removed indexes back
           indexes.each do |index|
-            sql_commands << "CREATE INDEX #{quote_table_name(index.name)} ON #{quote_table_name(table_name)} (#{index.columns.map { |c| quote_column_name(c) }.join(', ')})"
+            create_index_def = CreateIndexDefinition.new(index)
+            execute schema_creation.accept(create_index_def)
           end
 
-          sql_commands.each { |c| execute(c) }
           clear_cache!
         end
 
@@ -592,6 +594,7 @@ module ActiveRecord
         end
 
         def column_definitions_sql(database, identifier)
+          database = "TEMPDB" if identifier.temporary_table?
           schema_name = "schema_name()"
 
           if prepared_statements
@@ -602,12 +605,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,11 +7,18 @@ require "models/post"
 require "models/subscriber"
 require "models/minimalistic"
 require "models/college"
+require "models/dog"
+require "models/other_dog"
 require "models/discount"
 
 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_merge_sql) { "MERGE INTO [ships] WITH (UPDLOCK, HOLDLOCK) AS target USING ( SELECT * FROM ( SELECT [id], [name], ROW_NUMBER() OVER ( PARTITION BY [id] ORDER BY [id] DESC ) AS rn_0 FROM ( VALUES (101, N'RSS Sir David Attenborough') ) AS t1 ([id], [name]) ) AS ranked_source WHERE rn_0 = 1 ) AS source ON (target.[id] = source.[id]) WHEN MATCHED THEN UPDATE SET target.[name] = source.[name]" }
   let(:basic_update_sql) { "UPDATE [customers] SET [address_street] = NULL WHERE [id] = 2" }
@@ -52,8 +59,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"
@@ -225,6 +231,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
@@ -245,20 +254,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_merge_sql, basic_update_sql, basic_select_sql].each do |sql|
+      [basic_insert_sql, basic_merge_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
@@ -616,7 +637,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'raises an error when the foreign key is mismatched' do
-     error = assert_raises(ActiveRecord::MismatchedForeignKey) do
+      error = assert_raises(ActiveRecord::MismatchedForeignKey) do
         @conn.add_reference :engines, :old_car
         @conn.add_foreign_key :engines, :old_cars
       end

data/test/cases/change_column_index_test_sqlserver.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require "cases/helper_sqlserver"
+
+class ChangeColumnIndexTestSqlServer < ActiveRecord::TestCase
+  class CreateClientsWithUniqueIndex < ActiveRecord::Migration[8.0]
+    def up
+      create_table :clients do |t|
+        t.string :name, limit: 15
+      end
+      add_index :clients, :name, unique: true
+    end
+
+    def down
+      drop_table :clients
+    end
+  end
+
+  class CreateBlogPostsWithMultipleIndexesOnTheSameColumn < ActiveRecord::Migration[8.0]
+    def up
+      create_table :blog_posts do |t|
+        t.string :title, limit: 15
+        t.string :subtitle
+      end
+      add_index :blog_posts, :title, unique: true, where: "([blog_posts].[title] IS NOT NULL)", name: "custom_index_name"
+      add_index :blog_posts, [:title, :subtitle], unique: true
+    end
+
+    def down
+      drop_table :blog_posts
+    end
+  end
+
+  class ChangeClientsNameLength < ActiveRecord::Migration[8.0]
+    def up
+      change_column :clients, :name, :string, limit: 30
+    end
+  end
+
+  class ChangeBlogPostsTitleLength < ActiveRecord::Migration[8.0]
+    def up
+      change_column :blog_posts, :title, :string, limit: 30
+    end
+  end
+
+  before do
+    @old_verbose = ActiveRecord::Migration.verbose
+    ActiveRecord::Migration.verbose = false
+
+    CreateClientsWithUniqueIndex.new.up
+    CreateBlogPostsWithMultipleIndexesOnTheSameColumn.new.up
+  end
+
+  after do
+    CreateClientsWithUniqueIndex.new.down
+    CreateBlogPostsWithMultipleIndexesOnTheSameColumn.new.down
+
+    ActiveRecord::Migration.verbose = @old_verbose
+  end
+
+  def test_index_uniqueness_is_maintained_after_column_change
+    indexes = ActiveRecord::Base.connection.indexes("clients")
+    columns = ActiveRecord::Base.connection.columns("clients")
+    assert_equal columns.find { |column| column.name == "name" }.limit, 15
+    assert_equal indexes.size, 1
+    assert_equal indexes.first.name, "index_clients_on_name"
+    assert indexes.first.unique
+
+    ChangeClientsNameLength.new.up
+
+    indexes = ActiveRecord::Base.connection.indexes("clients")
+    columns = ActiveRecord::Base.connection.columns("clients")
+    assert_equal columns.find { |column| column.name == "name" }.limit, 30
+    assert_equal indexes.size, 1
+    assert_equal indexes.first.name, "index_clients_on_name"
+    assert indexes.first.unique
+  end
+
+  def test_multiple_index_options_are_maintained_after_column_change
+    indexes = ActiveRecord::Base.connection.indexes("blog_posts")
+    columns = ActiveRecord::Base.connection.columns("blog_posts")
+    assert_equal columns.find { |column| column.name == "title" }.limit, 15
+    assert_equal indexes.size, 2
+
+    index_1 = indexes.find { |index| index.columns == ["title"] }
+    assert_equal index_1.name, "custom_index_name"
+    assert_equal index_1.where, "([blog_posts].[title] IS NOT NULL)"
+    assert index_1.unique
+
+    index_2 = indexes.find { |index| index.columns == ["title", "subtitle"] }
+    assert index_2.unique
+
+    ChangeBlogPostsTitleLength.new.up
+
+    indexes = ActiveRecord::Base.connection.indexes("blog_posts")
+    columns = ActiveRecord::Base.connection.columns("blog_posts")
+    assert_equal columns.find { |column| column.name == "title" }.limit, 30
+    assert_equal indexes.size, 2
+
+    index_1 = indexes.find { |index| index.columns == ["title"] }
+    assert_equal index_1.name, "custom_index_name"
+    assert_equal index_1.where, "([blog_posts].[title] IS NOT NULL)"
+    assert index_1.unique
+
+    index_2 = indexes.find { |index| index.columns == ["title", "subtitle"] }
+    assert index_2.unique
+  end
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.7
+  version: 8.0.8
 platform: ruby
 authors:
 - Ken Collins
@@ -149,6 +149,7 @@ files:
 - test/cases/active_schema_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/change_column_collation_test_sqlserver.rb
+- test/cases/change_column_index_test_sqlserver.rb
 - test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
@@ -176,6 +177,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
@@ -241,8 +243,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.7/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.7
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.8/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.8
 rdoc_options: []
 require_paths:
 - lib
@@ -269,6 +271,7 @@ test_files:
 - test/cases/active_schema_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/change_column_collation_test_sqlserver.rb
+- test/cases/change_column_index_test_sqlserver.rb
 - test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
@@ -296,6 +299,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