activerecord-sqlserver-adapter 4.2.18 → 5.0.0

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

@@ -25,7 +25,7 @@ module ActiveRecord
 
       attr_reader :starting_isolation_level
 
-      def initialize(connection, options)
+      def initialize(connection, options, run_commit_callbacks: false)
         @connection = connection
         @starting_isolation_level = current_isolation_level if options[:isolation]
         super

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

@@ -1,43 +1,45 @@
 require 'active_record/type'
+# Behaviors
+require 'active_record/connection_adapters/sqlserver/type/data'
+require 'active_record/connection_adapters/sqlserver/type/time_value_fractional'
 # Exact Numerics
-require 'active_record/connection_adapters/sqlserver/type/integer.rb'
-require 'active_record/connection_adapters/sqlserver/type/big_integer.rb'
-require 'active_record/connection_adapters/sqlserver/type/small_integer.rb'
-require 'active_record/connection_adapters/sqlserver/type/tiny_integer.rb'
-require 'active_record/connection_adapters/sqlserver/type/boolean.rb'
-require 'active_record/connection_adapters/sqlserver/type/decimal.rb'
-require 'active_record/connection_adapters/sqlserver/type/money.rb'
-require 'active_record/connection_adapters/sqlserver/type/small_money.rb'
+require 'active_record/connection_adapters/sqlserver/type/integer'
+require 'active_record/connection_adapters/sqlserver/type/big_integer'
+require 'active_record/connection_adapters/sqlserver/type/small_integer'
+require 'active_record/connection_adapters/sqlserver/type/tiny_integer'
+require 'active_record/connection_adapters/sqlserver/type/boolean'
+require 'active_record/connection_adapters/sqlserver/type/decimal'
+require 'active_record/connection_adapters/sqlserver/type/money'
+require 'active_record/connection_adapters/sqlserver/type/small_money'
 # Approximate Numerics
-require 'active_record/connection_adapters/sqlserver/type/float.rb'
-require 'active_record/connection_adapters/sqlserver/type/real.rb'
+require 'active_record/connection_adapters/sqlserver/type/float'
+require 'active_record/connection_adapters/sqlserver/type/real'
 # Date and Time
-require 'active_record/connection_adapters/sqlserver/type/time_value_fractional.rb'
-require 'active_record/connection_adapters/sqlserver/type/date.rb'
-require 'active_record/connection_adapters/sqlserver/type/datetime.rb'
-require 'active_record/connection_adapters/sqlserver/type/datetime2.rb'
-require 'active_record/connection_adapters/sqlserver/type/datetimeoffset.rb'
-require 'active_record/connection_adapters/sqlserver/type/smalldatetime.rb'
-require 'active_record/connection_adapters/sqlserver/type/time.rb'
+require 'active_record/connection_adapters/sqlserver/type/date'
+require 'active_record/connection_adapters/sqlserver/type/datetime'
+require 'active_record/connection_adapters/sqlserver/type/datetime2'
+require 'active_record/connection_adapters/sqlserver/type/datetimeoffset'
+require 'active_record/connection_adapters/sqlserver/type/smalldatetime'
+require 'active_record/connection_adapters/sqlserver/type/time'
 # Character Strings
-require 'active_record/connection_adapters/sqlserver/type/string.rb'
-require 'active_record/connection_adapters/sqlserver/type/char.rb'
-require 'active_record/connection_adapters/sqlserver/type/varchar.rb'
-require 'active_record/connection_adapters/sqlserver/type/varchar_max.rb'
-require 'active_record/connection_adapters/sqlserver/type/text.rb'
+require 'active_record/connection_adapters/sqlserver/type/string'
+require 'active_record/connection_adapters/sqlserver/type/char'
+require 'active_record/connection_adapters/sqlserver/type/varchar'
+require 'active_record/connection_adapters/sqlserver/type/varchar_max'
+require 'active_record/connection_adapters/sqlserver/type/text'
 # Unicode Character Strings
-require 'active_record/connection_adapters/sqlserver/type/unicode_string.rb'
-require 'active_record/connection_adapters/sqlserver/type/unicode_char.rb'
-require 'active_record/connection_adapters/sqlserver/type/unicode_varchar.rb'
-require 'active_record/connection_adapters/sqlserver/type/unicode_varchar_max.rb'
-require 'active_record/connection_adapters/sqlserver/type/unicode_text.rb'
+require 'active_record/connection_adapters/sqlserver/type/unicode_string'
+require 'active_record/connection_adapters/sqlserver/type/unicode_char'
+require 'active_record/connection_adapters/sqlserver/type/unicode_varchar'
+require 'active_record/connection_adapters/sqlserver/type/unicode_varchar_max'
+require 'active_record/connection_adapters/sqlserver/type/unicode_text'
 # Binary Strings
-require 'active_record/connection_adapters/sqlserver/type/binary.rb'
-require 'active_record/connection_adapters/sqlserver/type/varbinary.rb'
-require 'active_record/connection_adapters/sqlserver/type/varbinary_max.rb'
+require 'active_record/connection_adapters/sqlserver/type/binary'
+require 'active_record/connection_adapters/sqlserver/type/varbinary'
+require 'active_record/connection_adapters/sqlserver/type/varbinary_max'
 # Other Data Types
-require 'active_record/connection_adapters/sqlserver/type/uuid.rb'
-require 'active_record/connection_adapters/sqlserver/type/timestamp.rb'
+require 'active_record/connection_adapters/sqlserver/type/uuid'
+require 'active_record/connection_adapters/sqlserver/type/timestamp'
 
 module ActiveRecord
   module Type

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

@@ -8,6 +8,10 @@ module ActiveRecord
             :bigint
           end
 
+          def sqlserver_type
+            'bigint'.freeze
+          end
+
         end
       end
     end

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

@@ -8,6 +8,12 @@ module ActiveRecord
             :binary_basic
           end
 
+          def sqlserver_type
+            'binary'.tap do |type|
+              type << "(#{limit})" if limit
+            end
+          end
+
         end
       end
     end

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

@@ -4,6 +4,9 @@ module ActiveRecord
       module Type
         class Boolean < ActiveRecord::Type::Boolean
 
+          def sqlserver_type
+            'bit'.freeze
+          end
 
         end
       end

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

@@ -8,32 +8,21 @@ module ActiveRecord
             :char
           end
 
-          def type_cast_for_database(value)
+          def serialize(value)
             return if value.nil?
             return value if value.is_a?(Data)
-            Data.new(super)
+            Data.new super, self
           end
 
-          class Data
-
-            def initialize(value)
-              @value = value.to_s
-            end
-
-            def quoted
-              "'#{Utils.quote_string(@value)}'"
-            end
-
-            def to_s
-              @value
-            end
-            alias_method :to_str, :to_s
-
-            def ==(other)
-              self.to_s == other.to_s
+          def sqlserver_type
+            'char'.tap do |type|
+              type << "(#{limit})" if limit
             end
-            alias_method :eql?, :==
+          end
 
+          def quoted(value)
+            return value.quoted_id if value.respond_to?(:quoted_id)
+            Utils.quote_string_single(value)
           end
 
         end

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

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class Data
+
+          attr_reader :value, :type
+
+          def initialize(value, type)
+            @value, @type = value, type
+          end
+
+          def quoted
+            type.quoted(@value)
+          end
+
+          def to_s
+            @value
+          end
+          alias_method :to_str, :to_s
+
+          def inspect
+            @value.inspect
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,14 +4,38 @@ module ActiveRecord
       module Type
         class Date < ActiveRecord::Type::Date
 
-          def type_cast_for_database(value)
+          def sqlserver_type
+            'date'.freeze
+          end
+
+          def serialize(value)
             return unless value.present?
-            return value if value.acts_like?(:string)
-            value.to_s(:_sqlserver_dateformat)
+            date = super(value).to_s(:_sqlserver_dateformat)
+            Data.new date, self
+          end
+
+          def deserialize(value)
+            value.is_a?(Data) ? super(value.value) : super
           end
 
           def type_cast_for_schema(value)
-            type_cast_for_database(value).inspect
+            serialize(value).quoted
+          end
+
+          def quoted(value)
+            Utils.quote_string_single(value)
+          end
+
+          private
+
+          def fast_string_to_date(string)
+            ::Date.strptime(string, fast_string_to_date_format)
+          rescue ArgumentError
+            super
+          end
+
+          def fast_string_to_date_format
+            ::Date::DATE_FORMATS[:_sqlserver_dateformat]
           end
 
         end

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

@@ -6,32 +6,46 @@ module ActiveRecord
 
           include TimeValueFractional
 
-          def type_cast_for_database(value)
-            return super unless value.acts_like?(:time)
-            value = zone_conversion(value)
-            datetime = value.to_s(:_sqlserver_datetime)
-            "#{datetime}".tap do |v|
+          def sqlserver_type
+            'datetime'.freeze
+          end
+
+          def serialize(value)
+            value = super
+            return value unless value.acts_like?(:time)
+            datetime = value.to_s(:_sqlserver_datetime).tap do |v|
               fraction = quote_fractional(value)
-              v << ".#{fraction}" unless fraction.to_i.zero?
+              v << ".#{fraction}"
             end
+            Data.new datetime, self
+          end
+
+          def deserialize(value)
+            value.is_a?(Data) ? super(value.value) : super
           end
 
           def type_cast_for_schema(value)
-            type_cast_for_database(value).inspect
+            serialize(value).quoted
           end
 
+          def quoted(value)
+            Utils.quote_string_single(value)
+          end
 
           private
 
-          def cast_value(value)
-            value = value.acts_like?(:time) ? value : super
-            return unless value
-            cast_fractional(value)
+          def fast_string_to_time(string)
+            fast_string_to_time_zone.strptime(string, fast_string_to_time_format).time
+          rescue ArgumentError
+            super
+          end
+
+          def fast_string_to_time_format
+            "#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N".freeze
           end
 
-          def zone_conversion(value)
-            method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
-            value.respond_to?(method) ? value.send(method) : value
+          def fast_string_to_time_zone
+            ::Time.zone || ActiveSupport::TimeZone['UTC']
           end
 
         end

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

@@ -6,8 +6,8 @@ module ActiveRecord
 
           include TimeValueFractional2
 
-          def type
-            :datetime2
+          def sqlserver_type
+            "datetime2(#{precision.to_i})"
           end
 
         end

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

@@ -4,24 +4,12 @@ module ActiveRecord
       module Type
         class DateTimeOffset < DateTime2
 
-          def type
-            :datetimeoffset
+          def sqlserver_type
+            "datetimeoffset(#{precision.to_i})"
           end
 
-          def type_cast_for_database(value)
-            return super unless value.acts_like?(:time)
-            value.to_s :_sqlserver_datetimeoffset
-          end
-
-          def type_cast_for_schema(value)
-            type_cast_for_database(value).inspect
-          end
-
-
-          private
-
-          def zone_conversion(value)
-            value
+          def quoted(value)
+            Utils.quote_string_single(value)
           end
 
         end

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

@@ -4,6 +4,15 @@ module ActiveRecord
       module Type
         class Decimal < ActiveRecord::Type::Decimal
 
+          def sqlserver_type
+            'decimal'.tap do |type|
+              type << "(#{precision.to_i},#{scale.to_i})" if precision || scale
+            end
+          end
+
+          def type_cast_for_schema(value)
+            value.is_a?(BigDecimal) ? value.to_s : value.inspect
+          end
 
         end
       end

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

@@ -8,6 +8,10 @@ module ActiveRecord
             :float
           end
 
+          def sqlserver_type
+            'float'.freeze
+          end
+
         end
       end
     end

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

@@ -4,6 +4,9 @@ module ActiveRecord
       module Type
         class Integer < ActiveRecord::Type::Integer
 
+          def sqlserver_type
+            'int'.freeze
+          end
 
         end
       end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class Money < Decimal
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @precision = 19
             @scale = 4
@@ -14,6 +14,10 @@ module ActiveRecord
             :money
           end
 
+          def sqlserver_type
+            'money'.freeze
+          end
+
         end
       end
     end

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

@@ -8,6 +8,10 @@ module ActiveRecord
             :real
           end
 
+          def sqlserver_type
+            'real'.freeze
+          end
+
         end
       end
     end

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

@@ -4,7 +4,9 @@ module ActiveRecord
       module Type
         class SmallInteger < Integer
 
-
+          def sqlserver_type
+            'smallint'.freeze
+          end
 
         end
       end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class SmallMoney < Money
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @precision = 10
             @scale = 4
@@ -14,6 +14,10 @@ module ActiveRecord
             :smallmoney
           end
 
+          def sqlserver_type
+            'smallmoney'.freeze
+          end
+
         end
       end
     end