activerecord-sqlserver-adapter 4.2.18 → 5.0.0

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

@@ -8,10 +8,17 @@ module ActiveRecord
             :smalldatetime
           end
 
+          def sqlserver_type
+            'smalldatetime'.freeze
+          end
 
           private
 
-          def cast_fractional(value)
+          def fast_string_to_time_format
+            ::Time::DATE_FORMATS[:_sqlserver_datetime]
+          end
+
+          def apply_seconds_precision(value)
             value.change usec: 0
           end
 

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

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

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

@@ -6,27 +6,39 @@ module ActiveRecord
 
           include TimeValueFractional2
 
-          def type_cast_for_database(value)
-            return super unless value.acts_like?(:time)
-            time = value.to_s(:_sqlserver_time)
-            "#{time}".tap do |v|
+          def serialize(value)
+            value = super
+            return value unless value.acts_like?(:time)
+            time = value.to_s(:_sqlserver_time).tap do |v|
               fraction = quote_fractional(value)
-              v << ".#{fraction}" unless fraction.to_i.zero?
+              v << ".#{fraction}"
             end
+            Data.new time, 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 sqlserver_type
+            "time(#{precision.to_i})"
+          end
+
+          def quoted(value)
+            Utils.quote_string_single(value)
+          end
 
           private
 
           def cast_value(value)
-            value = value.acts_like?(:time) ? value : super
+            value = super
             return if value.blank?
             value = value.change year: 2000, month: 01, day: 01
-            cast_fractional(value)
+            apply_seconds_precision(value)
           end
 
           def fractional_scale

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

@@ -7,20 +7,22 @@ module ActiveRecord
 
           private
 
-          def cast_fractional(value)
+          def apply_seconds_precision(value)
             return value if !value.respond_to?(fractional_property) || value.send(fractional_property).zero?
-            frac_seconds = if fractional_scale == 0
-                             0
-                           else
-                             seconds = value.send(fractional_property).to_f / fractional_operator.to_f
-                             seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
-                             (seconds * fractional_operator).to_i
-                           end
-            value.change fractional_property => frac_seconds
+            value.change fractional_property => seconds_precision(value)
+          end
+
+          def seconds_precision(value)
+            return 0 if fractional_scale == 0
+            seconds = value.send(fractional_property).to_f / fractional_operator.to_f
+            seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
+            (seconds * fractional_operator).round(0).to_i
           end
 
           def quote_fractional(value)
-            seconds = (value.send(fractional_property).to_f / fractional_operator.to_f).round(fractional_scale)
+            return 0 if fractional_scale == 0
+            frac_seconds = seconds_precision(value)
+            seconds = (frac_seconds.to_f / fractional_operator.to_f).round(fractional_scale)
             seconds.to_d.to_s.split('.').last.to(fractional_scale-1)
           end
 
@@ -52,6 +54,11 @@ module ActiveRecord
 
           private
 
+          def seconds_precision(value)
+            seconds = super
+            seconds > fractional_max ? fractional_scale_max : seconds
+          end
+
           def fractional_property
             :nsec
           end
@@ -68,6 +75,14 @@ module ActiveRecord
             precision
           end
 
+          def fractional_max
+            999999999
+          end
+
+          def fractional_scale_max
+            ('9' * fractional_scale) + ('0' * (fractional_digits - fractional_scale))
+          end
+
         end
 
       end

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

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

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

@@ -4,6 +4,9 @@ module ActiveRecord
       module Type
         class TinyInteger < Integer
 
+          def sqlserver_type
+            'tinyint'.freeze
+          end
 
           private
 

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

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

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

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

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class UnicodeVarchar < UnicodeChar
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 4000 if @limit.to_i == 0
           end
@@ -13,6 +13,12 @@ module ActiveRecord
             :string
           end
 
+          def sqlserver_type
+            'nvarchar'.tap do |type|
+              type << "(#{limit})" if limit
+            end
+          end
+
         end
       end
     end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class UnicodeVarcharMax < UnicodeVarchar
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 2_147_483_647
           end
@@ -13,6 +13,10 @@ module ActiveRecord
             :text
           end
 
+          def sqlserver_type
+            'nvarchar(max)'.freeze
+          end
+
         end
       end
     end

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

@@ -6,16 +6,29 @@ module ActiveRecord
 
           ACCEPTABLE_UUID = %r{\A\{?([a-fA-F0-9]{4}-?){8}\}?\z}x
 
-          alias_method :type_cast_for_database, :type_cast_from_database
+          alias_method :serialize, :deserialize
 
           def type
             :uuid
           end
 
-          def type_cast(value)
+          def sqlserver_type
+            'uniqueidentifier'.freeze
+          end
+
+          def serialize(value)
+            return unless value
+            Data.new super, self
+          end
+
+          def cast(value)
             value.to_s[ACCEPTABLE_UUID, 0]
           end
 
+          def quoted(value)
+            Utils.quote_string_single(value) if value
+          end
+
         end
       end
     end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class Varbinary < Binary
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 8000 if @limit.to_i == 0
           end
@@ -13,6 +13,12 @@ module ActiveRecord
             :varbinary
           end
 
+          def sqlserver_type
+            'varbinary'.tap do |type|
+              type << "(#{limit})" if limit
+            end
+          end
+
         end
       end
     end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class VarbinaryMax < Varbinary
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 2_147_483_647
           end
@@ -13,6 +13,10 @@ module ActiveRecord
             :binary
           end
 
+          def sqlserver_type
+            'varbinary(max)'.freeze
+          end
+
         end
       end
     end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class Varchar < Char
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 8000 if @limit.to_i == 0
           end
@@ -13,6 +13,12 @@ module ActiveRecord
             :varchar
           end
 
+          def sqlserver_type
+            'varchar'.tap do |type|
+              type << "(#{limit})" if limit
+            end
+          end
+
         end
       end
     end

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

@@ -4,7 +4,7 @@ module ActiveRecord
       module Type
         class VarcharMax < Varchar
 
-          def initialize(options = {})
+          def initialize(*args)
             super
             @limit = 2_147_483_647
           end
@@ -13,6 +13,10 @@ module ActiveRecord
             :varchar_max
           end
 
+          def sqlserver_type
+            'varchar(max)'.freeze
+          end
+
         end
       end
     end

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

@@ -5,6 +5,8 @@ module ActiveRecord
     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.
         #
@@ -118,6 +120,14 @@ module ActiveRecord
           s.to_s.gsub /\'/, "''"
         end
 
+        def quote_string_single(s)
+          "'#{quote_string(s)}'"
+        end
+
+        def quote_string_single_national(s)
+          "#{QUOTED_STRING_PREFIX}'#{quote_string(s)}'"
+        end
+
         def quoted_raw(name)
           SQLServer::Utils::Name.new(name).quoted_raw
         end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -13,9 +13,10 @@ require 'active_record/connection_adapters/sqlserver/database_statements'
 require 'active_record/connection_adapters/sqlserver/database_tasks'
 require 'active_record/connection_adapters/sqlserver/transaction'
 require 'active_record/connection_adapters/sqlserver/errors'
-require 'active_record/connection_adapters/sqlserver/schema_cache'
 require 'active_record/connection_adapters/sqlserver/schema_creation'
+require 'active_record/connection_adapters/sqlserver/schema_dumper'
 require 'active_record/connection_adapters/sqlserver/schema_statements'
+require 'active_record/connection_adapters/sqlserver/sql_type_metadata'
 require 'active_record/connection_adapters/sqlserver/showplan'
 require 'active_record/connection_adapters/sqlserver/table_definition'
 require 'active_record/connection_adapters/sqlserver/quoting'
@@ -32,6 +33,7 @@ module ActiveRecord
               SQLServer::Quoting,
               SQLServer::DatabaseStatements,
               SQLServer::Showplan,
+              SQLServer::SchemaDumper,
               SQLServer::SchemaStatements,
               SQLServer::DatabaseLimits,
               SQLServer::DatabaseTasks
@@ -42,27 +44,27 @@ module ActiveRecord
 
       cattr_accessor :cs_equality_operator, instance_accessor: false
       cattr_accessor :use_output_inserted, instance_accessor: false
-      cattr_accessor :lowercase_schema_reflection, :showplan_option
+      cattr_accessor :showplan_option, instance_accessor: false
+      cattr_accessor :lowercase_schema_reflection
 
       self.cs_equality_operator = 'COLLATE Latin1_General_CS_AS_WS'
       self.use_output_inserted = true
 
-      def initialize(connection, logger, pool, config)
-        super(connection, logger, pool)
-        # AbstractAdapter Responsibility
-        @schema_cache = SQLServer::SchemaCache.new self
-        @visitor = Arel::Visitors::SQLServer.new self
-        @prepared_statements = true
+      def initialize(connection, logger = nil, config = {})
+        super(connection, logger, config)
         # Our Responsibility
         @connection_options = config
         connect
-        @sqlserver_azure = !!(select_value('SELECT @@version', 'SCHEMA') =~ /Azure/i)
         initialize_dateformatter
         use_database
       end
 
       # === Abstract Adapter ========================================== #
 
+      def arel_visitor
+        Arel::Visitors::SQLServer.new self
+      end
+
       def valid_type?(type)
         !native_database_types[type].nil?
       end
@@ -71,10 +73,6 @@ module ActiveRecord
         SQLServer::SchemaCreation.new self
       end
 
-      def adapter_name
-        ADAPTER_NAME
-      end
-
       def supports_migrations?
         true
       end
@@ -83,10 +81,6 @@ module ActiveRecord
         true
       end
 
-      def supports_count_distinct?
-        true
-      end
-
       def supports_ddl_transactions?
         true
       end
@@ -95,14 +89,26 @@ module ActiveRecord
         false
       end
 
+      def supports_advisory_locks?
+        false
+      end
+
       def supports_index_sort_order?
         true
       end
 
+      def supports_index_sort_order?
+        false
+      end
+
       def supports_partial_index?
         true
       end
 
+      def supports_expression_index?
+        false
+      end
+
       def supports_explain?
         true
       end
@@ -111,14 +117,34 @@ module ActiveRecord
         true
       end
 
+      def supports_indexes_in_create?
+        false
+      end
+
+      def supports_foreign_keys?
+        true
+      end
+
       def supports_views?
         true
       end
 
-      def supports_foreign_keys?
+      def supports_datetime_with_precision?
         true
       end
 
+      def supports_json?
+        true
+      end
+
+      def supports_comments?
+        false
+      end
+
+      def supports_comments_in_create?
+        false
+      end
+
       def disable_referential_integrity
         tables = tables_with_referential_integrity
         tables.each { |t| do_execute "ALTER TABLE #{t} NOCHECK CONSTRAINT ALL" }
@@ -145,16 +171,19 @@ module ActiveRecord
 
       def disconnect!
         super
-        @spid = nil
         case @connection_options[:mode]
         when :dblib
           @connection.close rescue nil
-        when :odbc
-          @connection.disconnect rescue nil
         end
         @connection = nil
       end
 
+      def clear_cache!
+        @spid = nil
+        @collation = nil
+        super
+      end
+
       def reset!
         reset_transaction
         do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
@@ -180,10 +209,6 @@ module ActiveRecord
         pk ? [pk, nil] : nil
       end
 
-      def primary_key(table_name)
-        schema_cache.columns(table_name).find(&:is_primary?).try(:name) || identity_column(table_name).try(:name)
-      end
-
       # === SQLServer Specific (DB Reflection) ======================== #
 
       def sqlserver?
@@ -191,7 +216,7 @@ module ActiveRecord
       end
 
       def sqlserver_azure?
-        @sqlserver_azure
+        @sqlserver_azure ||= !!(select_value('SELECT @@version', 'SCHEMA') =~ /Azure/i)
       end
 
       def database_prefix_remote_server?
@@ -212,6 +237,13 @@ module ActiveRecord
         "#<#{self.class} version: #{version}, mode: #{@connection_options[:mode]}, azure: #{sqlserver_azure?.inspect}>"
       end
 
+      def combine_bind_parameters(from_clause: [], join_clause: [], where_clause: [], having_clause: [], limit: nil, offset: nil)
+        result = from_clause + join_clause + where_clause + having_clause
+        result << offset if offset
+        result << limit if limit
+        result
+      end
+
 
       protected
 
@@ -243,10 +275,13 @@ module ActiveRecord
         m.register_type              'real',              SQLServer::Type::Real.new
         # Date and Time
         m.register_type              'date',              SQLServer::Type::Date.new
-        m.register_type              'datetime',          SQLServer::Type::DateTime.new
-        m.register_type              %r{\Adatetime2}i do |sql_type|
+        m.register_type              %r{\Adatetime} do |sql_type|
           precision = extract_precision(sql_type)
-          SQLServer::Type::DateTime2.new precision: precision
+          if precision
+            SQLServer::Type::DateTime2.new precision: precision
+          else
+            SQLServer::Type::DateTime.new
+          end
         end
         m.register_type              %r{\Adatetimeoffset}i do |sql_type|
           precision = extract_precision(sql_type)
@@ -281,13 +316,15 @@ module ActiveRecord
       def translate_exception(e, message)
         case message
         when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
-          RecordNotUnique.new(message, e)
+          RecordNotUnique.new(message)
         when /conflicted with the foreign key constraint/i
-          InvalidForeignKey.new(message, e)
+          InvalidForeignKey.new(message)
         when /has been chosen as the deadlock victim/i
-          DeadlockVictim.new(message, e)
+          DeadlockVictim.new(message)
         when /database .* does not exist/i
-          NoDatabaseError.new(message, e)
+          NoDatabaseError.new(message)
+        when /data would be truncated/
+          ValueTooLong.new(message)
         else
           super
         end
@@ -300,8 +337,6 @@ module ActiveRecord
         @connection = case config[:mode]
                       when :dblib
                         dblib_connect(config)
-                      when :odbc
-                        odbc_connect(config)
                       end
         @spid = _raw_select('SELECT @@SPID', fetch: :rows).first.first
         configure_connection
@@ -310,7 +345,6 @@ module ActiveRecord
       def connection_errors
         @connection_errors ||= [].tap do |errors|
           errors << TinyTds::Error if defined?(TinyTds::Error)
-          errors << ODBC::Error if defined?(ODBC::Error)
         end
       end
 
@@ -327,8 +361,7 @@ module ActiveRecord
           login_timeout: config_login_timeout(config),
           timeout: config_timeout(config),
           encoding:  config_encoding(config),
-          azure: config[:azure],
-          contained: config[:contained]
+          azure: config[:azure]
         ).tap do |client|
           if config[:azure]
             client.execute('SET ANSI_NULLS ON').do
@@ -348,25 +381,6 @@ module ActiveRecord
         end
       end
 
-      def odbc_connect(config)
-        if config[:dsn].include?(';')
-          driver = ODBC::Driver.new.tap do |d|
-            d.name = config[:dsn_name] || 'Driver1'
-            d.attrs = config[:dsn].split(';').map { |atr| atr.split('=') }.reject { |kv| kv.size != 2 }.reduce({}) { |a, e| k, v = e ; a[k] = v ; a }
-          end
-          ODBC::Database.new.drvconnect(driver)
-        else
-          ODBC.connect config[:dsn], config[:username], config[:password]
-        end.tap do |c|
-          begin
-            c.use_time = true
-            c.use_utc = ActiveRecord::Base.default_timezone == :utc
-          rescue Exception
-            warn 'Ruby ODBC v0.99992 or higher is required.'
-          end
-        end
-      end
-
       def config_appname(config)
         config[:appname] || configure_application_name || Rails.application.class.name.split('::').first rescue nil
       end