activerecord-sqlserver-adapter 6.1.2.1 → 7.2.4

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

@@ -5,14 +5,12 @@ require "active_record/connection_adapters/abstract/transaction"
 module ActiveRecord
   module ConnectionAdapters
     module SQLServerTransaction
-      private
+      delegate :sqlserver?, to: :connection, prefix: true
 
-      def sqlserver?
-        connection.respond_to?(:sqlserver?) && connection.sqlserver?
-      end
+      private
 
       def current_isolation_level
-        return unless sqlserver?
+        return unless connection_sqlserver?
 
         level = connection.user_options_isolation_level
         # When READ_COMMITTED_SNAPSHOT is set to ON,
@@ -50,7 +48,7 @@ module ActiveRecord
       private
 
       def reset_starting_isolation_level
-        if sqlserver? && starting_isolation_level
+        if connection_sqlserver? && starting_isolation_level
           connection.set_transaction_isolation_level(starting_isolation_level)
         end
       end

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

@@ -7,6 +7,8 @@ module ActiveRecord
         class Data
           attr_reader :value, :type
 
+          delegate :sub, to: :value
+
           def initialize(value, type)
             @value, @type = value, type
           end
@@ -25,9 +27,25 @@ module ActiveRecord
           end
 
           def eql?(other)
-            self.class == other.class && self.value == other.value
+            # Support comparing `Type::Char`, `Type::Varchar` and `VarcharMax` with strings.
+            # This happens when we use enum with string columns.
+            if other.is_a?(::String)
+              return type.is_a?(ActiveRecord::ConnectionAdapters::SQLServer::Type::String) && value == other
+            end
+
+            self.class == other.class && value == other.value
           end
           alias :== :eql?
+
+          def self.from_msgpack_ext(string)
+            type, value = string.chomp!("msgpack_ext").split(',')
+
+            Data.new(value, type.constantize)
+          end
+
+          def to_msgpack_ext
+            [type.class.to_s, value].join(',') + "msgpack_ext"
+          end
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/type/date.rb

@@ -13,7 +13,7 @@ module ActiveRecord
             value = super
             return value unless value.acts_like?(:date)
 
-            date = super(value).to_s(:_sqlserver_dateformat)
+            date = super(value).to_formatted_s(:_sqlserver_dateformat)
             Data.new date, self
           end
 

data/lib/active_record/connection_adapters/sqlserver/type/datetime.rb

@@ -15,7 +15,7 @@ module ActiveRecord
             value = super
             return value unless value.acts_like?(:time)
 
-            datetime = "#{value.to_s(:_sqlserver_datetime)}.#{quote_fractional(value)}"
+            datetime = "#{value.to_formatted_s(:_sqlserver_datetime)}.#{quote_fractional(value)}"
 
             Data.new datetime, self
           end

data/lib/active_record/connection_adapters/sqlserver/type/time.rb

@@ -11,7 +11,7 @@ module ActiveRecord
             value = super
             return value unless value.acts_like?(:time)
 
-            time = "#{value.to_s(:_sqlserver_time)}.#{quote_fractional(value)}"
+            time = "#{value.to_formatted_s(:_sqlserver_time)}.#{quote_fractional(value)}"
 
             Data.new time, self
           end

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

@@ -6,13 +6,9 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Utils
-        QUOTED_STRING_PREFIX = "N"
-
         # Value object to return identifiers from SQL Server names http://bit.ly/1CZ3EiL
-        # Inspiried from Rails PostgreSQL::Name adapter object in their own Utils.
-        #
+        # Inspired from Rails PostgreSQL::Name adapter object in their own Utils.
         class Name
-          SEPARATOR = "."
           UNQUOTED_SCANNER = /\]?\./
           QUOTED_SCANNER   = /\A\[.*?\]\./
           QUOTED_CHECKER   = /\A\[/
@@ -42,11 +38,26 @@ module ActiveRecord
           end
 
           def fully_qualified_database_quoted
-            [server_quoted, database_quoted].compact.join(SEPARATOR)
+            [server_quoted, database_quoted].compact.join('.')
           end
 
           def fully_qualified?
-            parts.compact.size == 4
+            qualified_level == :fully
+          end
+
+          def qualified_level
+            case parts.compact.size
+            when 4
+              :fully
+            when 3
+              :database
+            when 2
+              :schema
+            when 1
+              :table
+            else
+              :none
+            end
           end
 
           def to_s
@@ -54,7 +65,7 @@ module ActiveRecord
           end
 
           def quoted
-            parts.map { |p| quote(p) if p }.join SEPARATOR
+            parts.map { |p| quote(p) if p }.join('.')
           end
 
           def quoted_raw
@@ -117,7 +128,7 @@ module ActiveRecord
         extend self
 
         def quote_string(s)
-          s.to_s.gsub /\'/, "''"
+          s.to_s.gsub(/\'/, "''")
         end
 
         def quote_string_single(s)
@@ -125,7 +136,7 @@ module ActiveRecord
         end
 
         def quote_string_single_national(s)
-          "#{QUOTED_STRING_PREFIX}'#{quote_string(s)}'"
+          "N'#{quote_string(s)}'"
         end
 
         def quoted_raw(name)