activerecord-sqlserver-adapter 8.1.3 → 8.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b233f0d16ac6cda7cd510614f1c9262f7362fa9a19ccdfc20664c36bcee6852a
-  data.tar.gz: 9929d4e6e483b4594969333727fdfabacf379bd59b57f9a336673a1f1a04a057
+  metadata.gz: b449fb9569a0dcfc91cc7e0109a29a145dc0c11b8488a3eb486650fa037eb2ad
+  data.tar.gz: ca39fe0127a4ab8e507b49c5a49f59ae02f193d6d54ae3f0d2e9f7731c6f4b08
 SHA512:
-  metadata.gz: 715cf25b356956e018c9ff202583b77c48e50d8946d0eef5b2b4a4dc75d1fea206a2ce5db78109722c6eda000d24cb222d6abd25cf3b630885236d76a83c623b
-  data.tar.gz: 139afbfa982ca4ae21be4458ea3b1666803750810443a754099a01f9479acc83c35bd0aa4ede17e7416cf0702d0417714f02fdeae5da09aebddf873061d4ff77
+  metadata.gz: d5a25f54332ba7e594ceef724da573ef3add3820e7f7de4dcc3a59622c77b5a5978a433efa42894f9467d8940024e11345022d556522a2000289a5f2046cd012
+  data.tar.gz: ed563ea7651fb586b42c3d59f17d8459b73245ebf014b9121a85baff1584a405a4ec72e8a1a005cbf57c9e0fa84f8a5c8ad4b20c3d451a5490e58b19f34af394

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v8.1.4
+
+#### Fixed
+
+- [#1418](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1418) Fix `change_column_null` to re-declare datetime2 columns correctly.
+
+#### Changed
+
+- [#1405](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1405) Fix `insert_all`/`upsert_all` for single character, temporary, non-ASCII and three part table names, and stop an aliased target being included in the `MERGE` table name.
+
 ## v8.1.3
 
 #### Added

data/Gemfile

@@ -62,7 +62,6 @@ end
 
 group :development do
   gem "minitest-spec-rails"
-  gem "mocha"
   gem "pry-byebug", platform: [:mri, :mingw, :x64_mingw]
 end
 

data/VERSION

@@ -1 +1 @@
-8.1.3
+8.1.4

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

@@ -4,6 +4,9 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module SchemaStatements
+        MERGE_TARGET_IDENTIFIER = /(?:\[[^\]]+\]|[a-z0-9_-]+)/i # :nodoc:
+        MERGE_TARGET_TABLE_NAME = /\A\s*MERGE\s+INTO\s+(#{MERGE_TARGET_IDENTIFIER}(?:\s*\.#{MERGE_TARGET_IDENTIFIER}){0,2})\s+(?:AS|WITH|USING)/i # :nodoc:
+
         def create_table(table_name, **options)
           res = super
           clear_cache!
@@ -411,7 +414,12 @@ module ActiveRecord
           if !null.nil? && null == false && !default.nil?
             execute("UPDATE #{table_id} SET #{column_id}=#{quote(default)} WHERE #{column_id} IS NULL")
           end
-          sql = "ALTER TABLE #{table_id} ALTER COLUMN #{column_id} #{type_to_sql column.type, limit: column.limit, precision: column.precision, scale: column.scale}"
+
+          # If datetime column has precision then it should be datetime2 column.
+          column_type = column.type
+          column_type = :datetime2 if column.type.to_s == "datetime" && !column.precision.nil?
+
+          sql = "ALTER TABLE #{table_id} ALTER COLUMN #{column_id} #{type_to_sql column_type, limit: column.limit, precision: column.precision, scale: column.scale}"
           sql += " NOT NULL" if !null.nil? && null == false
 
           execute sql
@@ -726,7 +734,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-z0-9_ -]+\]?\.?\[?[a-z0-9_ -]+\]?)\s+(AS|WITH|USING)/i)[1]
+            s.match(MERGE_TARGET_TABLE_NAME)[1]
           else
             s.match(/FROM[\s|(]+((\[[^(\]]+\])|[^(\s]+)\s*/i)[1]
           end.strip

data/test/cases/adapter_test_sqlserver.rb

@@ -230,6 +230,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       @identity_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] WHEN NOT MATCHED BY TARGET THEN INSERT ([id], [name]) VALUES (source.[id], source.[name]) OUTPUT INSERTED.[id]"
       @identity_merge_sql_unquoted = "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 WHEN NOT MATCHED BY TARGET THEN INSERT (id, name) VALUES (source.id, source.name) OUTPUT INSERTED.id"
       @identity_merge_sql_unordered = "MERGE INTO [ships] WITH (UPDLOCK, HOLDLOCK) AS target USING ( SELECT * FROM ( SELECT [name], [id], ROW_NUMBER() OVER ( PARTITION BY [id] ORDER BY [id] DESC ) AS rn_0 FROM ( VALUES (101, N'RSS Sir David Attenborough') ) AS t1 ([name], [id]) ) AS ranked_source WHERE rn_0 = 1 ) AS source ON (target.[id] = source.[id]) WHEN MATCHED THEN UPDATE SET target.[name] = source.[name] WHEN NOT MATCHED BY TARGET THEN INSERT ([name], [id]) VALUES (source.[name], source.[id]) OUTPUT INSERTED.[id]"
+      @identity_merge_sql_aliased_target = @identity_merge_sql.sub(" WITH (UPDLOCK, HOLDLOCK)", "")
 
       @identity_insert_sql_non_dbo = "INSERT INTO [test].[aliens] ([id],[name]) VALUES(420,'Mork')"
       @identity_insert_sql_non_dbo_unquoted = "INSERT INTO test.aliens ([id],[name]) VALUES(420,'Mork')"
@@ -253,6 +254,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal "[ships]", connection.send(:query_requires_identity_insert?, @identity_merge_sql)
       assert_equal "[ships]", connection.send(:query_requires_identity_insert?, @identity_merge_sql_unquoted)
       assert_equal "[ships]", connection.send(:query_requires_identity_insert?, @identity_merge_sql_unordered)
+      assert_equal "[ships]", connection.send(:query_requires_identity_insert?, @identity_merge_sql_aliased_target)
 
       assert_equal "[test].[aliens]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_non_dbo)
       assert_equal "[test].[aliens]", connection.send(:query_requires_identity_insert?, @identity_insert_sql_non_dbo_unquoted)

data/test/cases/change_column_null_test_sqlserver.rb

@@ -2,29 +2,31 @@
 
 require "cases/helper_sqlserver"
 require "migrations/create_clients_and_change_column_null"
+require "cases/migration/helper"
 
 class ChangeColumnNullTestSqlServer < ActiveRecord::TestCase
-  before do
-    @old_verbose = ActiveRecord::Migration.verbose
-    ActiveRecord::Migration.verbose = false
-    CreateClientsAndChangeColumnNull.new.up
-  end
+  include ::ActiveRecord::Migration::TestHelper
 
-  after do
-    CreateClientsAndChangeColumnNull.new.down
-    ActiveRecord::Migration.verbose = @old_verbose
+  def find_column(table, column_name)
+    connection.columns(table).find { |column| column.name == column_name.to_s }
   end
 
-  def find_column(table, name)
-    table.find { |column| column.name == name }
-  end
+  describe "using migration" do
+    before do
+      @old_verbose = ActiveRecord::Migration.verbose
+      ActiveRecord::Migration.verbose = false
+      CreateClientsAndChangeColumnNull.new.up
+    end
+
+    after do
+      CreateClientsAndChangeColumnNull.new.down
+      ActiveRecord::Migration.verbose = @old_verbose
+    end
 
-  let(:clients_table) { connection.columns("clients") }
-  let(:name_column) { find_column(clients_table, "name") }
-  let(:code_column) { find_column(clients_table, "code") }
-  let(:value_column) { find_column(clients_table, "value") }
+    let(:name_column) { find_column("clients", "name") }
+    let(:code_column) { find_column("clients", "code") }
+    let(:value_column) { find_column("clients", "value") }
 
-  describe "#change_column_null" do
     it "does not change the column limit" do
       _(name_column.limit).must_equal 15
     end
@@ -41,4 +43,32 @@ class ChangeColumnNullTestSqlServer < ActiveRecord::TestCase
       _(value_column.scale).must_equal 8
     end
   end
+
+  it "datetime2 column" do
+    add_column :test_models, :expiry_date, :datetime, precision: 6, null: true
+
+    _(find_column(:test_models, :expiry_date).sql_type).must_equal "datetime2(6)"
+    _(find_column(:test_models, :expiry_date).null).must_equal true
+
+    connection.change_column_null(:test_models, :expiry_date, false)
+
+    _(find_column(:test_models, :expiry_date).sql_type).must_equal "datetime2(6)"
+    _(find_column(:test_models, :expiry_date).null).must_equal false
+  ensure
+    remove_column("test_models", "expiry_date")
+  end
+
+  it "datetime column" do
+    add_column :test_models, :expiry_date, :datetime, precision: nil, null: true
+
+    _(find_column(:test_models, :expiry_date).sql_type).must_equal "datetime"
+    _(find_column(:test_models, :expiry_date).null).must_equal true
+
+    connection.change_column_null(:test_models, :expiry_date, false)
+
+    _(find_column(:test_models, :expiry_date).sql_type).must_equal "datetime"
+    _(find_column(:test_models, :expiry_date).null).must_equal false
+  ensure
+    remove_column("test_models", "expiry_date")
+  end
 end

data/test/cases/coerced_tests.rb

@@ -77,6 +77,26 @@ class UniquenessValidationWithIndexTest < ActiveRecord::TestCase
   end
 end
 
+module ActiveRecord
+  class Migration::IndexTest < ActiveRecord::TestCase
+    # SQL Server requires an explicit truthy comparison for BIT columns.
+    coerce_tests! :test_rename_index_preserves_where_clause
+    def test_rename_index_preserves_where_clause_coerced
+      skip unless connection.supports_partial_index?
+
+      # Keep the names short to make Oracle and similar behave.
+      connection.add_index(table_name, [:foo], name: "old_idx", where: "administrator = 1")
+      old_where = connection.indexes(table_name).find { |i| i.name == "old_idx" }.where
+
+      connection.rename_index(table_name, "old_idx", "new_idx")
+
+      new_index = connection.indexes(table_name).find { |i| i.name == "new_idx" }
+      assert_not_nil new_index
+      assert_equal old_where, new_index.where
+    end
+  end
+end
+
 module ActiveRecord
   class AdapterTest < ActiveRecord::TestCase
     # Legacy binds are not supported.
@@ -163,7 +183,7 @@ module ActiveRecord
     # SQL Server does not allow truncation of tables that are referenced by foreign key
     # constraints. So manually remove/add foreign keys in test.
     coerce_tests! :test_truncate_tables_with_query_cache
-    def test_truncate_tables_with_query_cache
+    def test_truncate_tables_with_query_cache_coerced
       # Remove foreign key constraint to allow truncation.
       @connection.remove_foreign_key :authors, :author_addresses
 
@@ -518,8 +538,8 @@ module ActiveRecord
         five = columns.detect { |c| c.name == "five" }
 
         assert_equal "hello", one.default
-        assert_equal true, two.fetch_cast_type(connection).deserialize(two.default)
-        assert_equal false, three.fetch_cast_type(connection).deserialize(three.default)
+        assert_equal true, two.cast_type.deserialize(two.default)
+        assert_equal false, three.cast_type.deserialize(three.default)
         assert_equal 1, four.default
         assert_equal "hello", five.default
       end
@@ -2053,7 +2073,6 @@ class UnsafeRawSqlTest < ActiveRecord::TestCase
   test "order: allows nested functions" do
     ids_expected = Post.order(Arel.sql("author_id, len(trim(title))")).pluck(:id)
 
-    # $DEBUG = true
     ids = Post.order("author_id, len(trim(title))").pluck(:id)
 
     assert_equal ids_expected, ids
@@ -2442,6 +2461,50 @@ class FieldOrderedValuesTest < ActiveRecord::TestCase
     Book.where(author_id: nil, name: nil).delete_all
     Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
   end
+
+  # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
+  coerce_tests! :test_in_order_of_with_out_of_bound_integer_does_not_match_nulls
+  def test_in_order_of_with_out_of_bound_integer_does_not_match_nulls_coerced
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
+
+    original_test_in_order_of_with_out_of_bound_integer_does_not_match_nulls
+  ensure
+    Book.where(author_id: nil, name: nil).delete_all
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
+  end
+
+  # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
+  coerce_tests! :test_in_order_of_with_only_unrepresentable_values_does_not_build_empty_case
+  def test_in_order_of_with_only_unrepresentable_values_does_not_build_empty_case_coerced
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
+
+    original_test_in_order_of_with_only_unrepresentable_values_does_not_build_empty_case
+  ensure
+    Book.where(author_id: nil, name: nil).delete_all
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
+  end
+
+  # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
+  coerce_tests! :test_in_order_of_with_unknown_enum_key_does_not_match_nulls
+  def test_in_order_of_with_unknown_enum_key_does_not_match_nulls_coerced
+    Book.lease_connection.remove_index(:books, column: [:author_id, :name])
+
+    original_test_in_order_of_with_unknown_enum_key_does_not_match_nulls
+  ensure
+    Book.where(author_id: nil, name: nil).delete_all
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
+  end
+
+  # Need to remove index as SQL Server considers NULLs on a unique-index to be equal unlike PostgreSQL/MySQL/SQLite.
+  coerce_tests! :test_in_order_of_with_column_from_cte
+  def test_in_order_of_with_column_from_cte_coerced
+    connection.remove_index(:books, column: [:author_id, :name])
+
+    original_test_in_order_of_with_column_from_cte
+  ensure
+    Book.where(author_id: nil, name: nil).delete_all
+    Book.lease_connection.add_index(:books, [:author_id, :name], unique: true)
+  end
 end
 
 class QueryLogsTest < ActiveRecord::TestCase
@@ -2837,3 +2900,13 @@ class EachTest < ActiveRecord::TestCase
     end
   end
 end
+
+class ActiveRecord::Encryption::EncryptableFixtureTest < ActiveRecord::EncryptionTestCase
+  # Set the attribute as JSON type.
+  ::EncryptedBookWithJson.attribute :metadata, ActiveRecord::Type::SQLServer::Json.new
+
+  coerce_tests! %r{fixtures for json columns get encrypted automatically}
+  def fixtures_for_json_columns_get_encrypted_automatically
+    send(:"original_fixtures for json columns get encrypted automatically")
+  end
+end

data/test/cases/dbconsole_test_sqlserver.rb

@@ -4,13 +4,11 @@ class DbConsole < ActiveRecord::TestCase
   subject { ActiveRecord::ConnectionAdapters::SQLServerAdapter }
 
   it "uses sqlcmd to connect to database" do
-    subject.expects(:find_cmd_and_exec).with("sqlcmd", "-d", "db", "-U", "user", "-P", "secret", "-C", "-S",
-      "tcp:localhost,1433")
+    assert_called_with(subject, :find_cmd_and_exec, ["sqlcmd", "-d", "db", "-U", "user", "-P", "secret", "-C", "-S", "tcp:localhost,1433"]) do
+      config = make_db_config(adapter: "sqlserver", database: "db", username: "user", password: "secret", host: "localhost", port: 1433, trust_server_certificate: true)
 
-    config = make_db_config(adapter: "sqlserver", database: "db", username: "user", password: "secret",
-      host: "localhost", port: 1433, trust_server_certificate: true)
-
-    subject.dbconsole(config)
+      subject.dbconsole(config)
+    end
   end
 
   private

data/test/cases/helper_sqlserver.rb

@@ -14,7 +14,6 @@ require "support/load_schema_sqlserver"
 require "support/coerceable_test_sqlserver"
 require "support/connection_reflection"
 require "support/query_assertions"
-require "mocha/minitest"
 
 Minitest.after_run do
   puts "\n\n"

data/test/cases/schema_test_sqlserver.rb

@@ -122,6 +122,38 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
       it do
         assert_equal "[with_numbers_1234]", connection.send(:get_raw_table_name, "MERGE INTO [with_numbers_1234] AS target")
       end
+
+      it do
+        assert_equal "[dashboards]", connection.send(:get_raw_table_name, "MERGE INTO [dashboards] AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "lock_without_defaults", connection.send(:get_raw_table_name, "MERGE INTO lock_without_defaults AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "[WITH - SPACES]", connection.send(:get_raw_table_name, "MERGE INTO [WITH - SPACES] AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "MERGE INTO [with].[select notation] AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "[x]", connection.send(:get_raw_table_name, "MERGE INTO [x] WITH (UPDLOCK, HOLDLOCK) AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "MERGE INTO [with].[select notation] WITH (UPDLOCK, HOLDLOCK) AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "[a].[dbo].[dashboards]", connection.send(:get_raw_table_name, "MERGE INTO [a].[dbo].[dashboards] WITH (UPDLOCK, HOLDLOCK) AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
+
+      it do
+        assert_equal "with .dashboards", connection.send(:get_raw_table_name, "MERGE INTO with .dashboards WITH (UPDLOCK, HOLDLOCK) AS target USING (VALUES (1)) AS source ([id]) ON (target.[id] = source.[id]) WHEN NOT MATCHED THEN INSERT ([id]) VALUES (source.[id]);")
+      end
     end
 
     describe "CREATE VIEW statements" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.1.3
+  version: 8.1.4
 platform: ruby
 authors:
 - Ken Collins
@@ -245,8 +245,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.1.3/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.1.3
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.1.4/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.1.4
 rdoc_options: []
 require_paths:
 - lib
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.16
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files: []