activerecord-sqlserver-adapter 8.0.11 → 8.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7b74bdd65380e149a3aaf18932da7617fad49c37b1b860ef10075c02e841e6
-  data.tar.gz: e30b7c80bab6f9fdf6e12be1898ab6c16ba61aed8ced1b6f50dbe0dae8a2c6d1
+  metadata.gz: f29d990915f935a12f18189d83a0cc11916810756fdac53a52059fcf7e1b8b6b
+  data.tar.gz: a5cc606fc70a25ef265f5905c39488267f9a879a7453e422a233bf1e1310aa4d
 SHA512:
-  metadata.gz: 505fed8945112dddbb083dafb7533c3c0901a4ea880244fa2cee278f39984ef4d74ec1a98b31057781591aa9a9c53c8b6d564826677c0b3d57d40dd98274f512
-  data.tar.gz: 7829782f9cd4a23173c92e5b6265dd184331eeab2b0fedba15fd32b245e60ef0180a76358a6c5b0f9ff8ab38b30f427c8fc37ffb62805985933b89accb12a02d
+  metadata.gz: 5e23eb5561377a71f81fb04207bd943b9a30e81b8c01bf7b1a9957a0ade81b7877905dacb9134dce4ad0c129dcb582a487cc2334c1b14e075c804d0a3e803bed
+  data.tar.gz: 987035b58b5f7f3fd598d6f819e53a0eb653b8a8390199c56f30765b9f58f461f4a0a44833a3dbf4d6ca1e14f82fb39a3e9c30d469cd3702665dea4103566a69

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v8.0.12
+
+#### 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.0.11
 
 #### Changed

data/Gemfile

@@ -13,6 +13,7 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "benchmark-ips"
 gem "minitest", "~> 6.0"
 gem "msgpack", ">= 1.7.0"
+gem "json", ">= 2.0.0", "!=2.7.0", "< 2.20"
 
 if ENV["RAILS_SOURCE"]
   gemspec path: ENV["RAILS_SOURCE"]

data/VERSION

@@ -1 +1 @@
-8.0.11
+8.0.12

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 native_database_types
           @native_database_types ||= initialize_native_database_types.freeze
         end
@@ -349,12 +352,12 @@ module ActiveRecord
 
         def columns_for_distinct(columns, orders)
           order_columns = orders.reject(&:blank?).map { |s|
-                            s = visitor.compile(s) unless s.is_a?(String)
-                            s.gsub(/\s+(?:ASC|DESC)\b/i, "")
-                             .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, "")
-                            }
-                            .reject(&:blank?)
-                            .reject { |s| columns.include?(s) }
+            s = visitor.compile(s) unless s.is_a?(String)
+            s.gsub(/\s+(?:ASC|DESC)\b/i, "")
+             .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, "")
+          }
+                                .reject(&:blank?)
+                                .reject { |s| columns.include?(s) }
 
           order_columns_aliased = order_columns.map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
@@ -374,7 +377,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
@@ -720,7 +728,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
@@ -745,24 +753,24 @@ module ActiveRecord
           @view_information ||= {}
 
           @view_information[table_name] ||= begin
-            identifier = SQLServer::Utils.extract_identifiers(table_name)
-            information_query_table = identifier.database.present? ? "[#{identifier.database}].[INFORMATION_SCHEMA].[VIEWS]" :  "[INFORMATION_SCHEMA].[VIEWS]"
-
-            view_info = select_one("SELECT * FROM #{information_query_table} WITH (NOLOCK) WHERE TABLE_NAME = #{quote(identifier.object)}", "SCHEMA").to_h
-
-            if view_info.present?
-              if view_info['VIEW_DEFINITION'].blank? || view_info['VIEW_DEFINITION'].length == 4000
-                view_info['VIEW_DEFINITION'] = begin
-                                                 select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
-                                               rescue
-                                                 warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
-                                                 nil
-                                               end
-              end
-            end
-
-            view_info
-          end
+                                              identifier = SQLServer::Utils.extract_identifiers(table_name)
+                                              information_query_table = identifier.database.present? ? "[#{identifier.database}].[INFORMATION_SCHEMA].[VIEWS]" :  "[INFORMATION_SCHEMA].[VIEWS]"
+
+                                              view_info = select_one("SELECT * FROM #{information_query_table} WITH (NOLOCK) WHERE TABLE_NAME = #{quote(identifier.object)}", "SCHEMA").to_h
+
+                                              if view_info.present?
+                                                if view_info['VIEW_DEFINITION'].blank? || view_info['VIEW_DEFINITION'].length == 4000
+                                                  view_info['VIEW_DEFINITION'] = begin
+                                                                                   select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
+                                                                                 rescue
+                                                                                   warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
+                                                                                   nil
+                                                                                 end
+                                                end
+                                              end
+
+                                              view_info
+                                            end
         end
 
         def views_real_column_name(table_name, column_name)

data/test/cases/adapter_test_sqlserver.rb

@@ -224,6 +224,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')"
@@ -247,6 +248,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/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.0.11
+  version: 8.0.12
 platform: ruby
 authors:
 - Ken Collins
@@ -243,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.11/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.11
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.12/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.12
 rdoc_options: []
 require_paths:
 - lib
@@ -259,7 +259,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: