activerecord-sqlserver-adapter 4.2.6 → 4.2.8

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

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class DateTime2 < DateTime
+
+          include TimeValueFractional2
+
+          def type
+            :datetime2
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class DateTimeOffset < DateTime2
+
+          def type
+            :datetimeoffset
+          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
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,15 +4,15 @@ module ActiveRecord
       module Type
         class SmallDateTime < DateTime
 
+          def type
+            :smalldatetime
+          end
 
-          private
 
-          def cast_usec(value)
-            0
-          end
+          private
 
-          def cast_usec_for_database(value)
-            '.000'
+          def cast_fractional(value)
+            value.change usec: 0
           end
 
         end

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

@@ -1,52 +1,36 @@
-Time::DATE_FORMATS[:_sqlserver_time] = '%H:%M:%S'
-
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
         class Time < ActiveRecord::Type::Time
 
-          def initialize(options = {})
-            super
-            @precision = nil if @precision == 7
-          end
+          include TimeValueFractional2
 
           def type_cast_for_database(value)
-            return if value.nil?
-            Quoter.new super, self
+            return super unless value.acts_like?(:time)
+            time = value.to_s(:_sqlserver_time)
+            "#{time}".tap do |v|
+              fraction = quote_fractional(value)
+              v << ".#{fraction}" unless fraction.to_i.zero?
+            end
           end
 
           def type_cast_for_schema(value)
-            value.acts_like?(:string) ? "'#{value}'" : super
-          end
-
-          def quote_ss(value)
-            return unless value
-            value = cast_value(value) if value.acts_like?(:string)
-            date = value.to_s(:_sqlserver_time)
-            frac = quote_usec(value)
-            "'#{date}.#{frac}'"
+            type_cast_for_database(value).inspect
           end
 
 
           private
 
           def cast_value(value)
-            value = value.respond_to?(:usec) ? value.change(year: 2000, month: 01, day: 01) : super
+            value = value.acts_like?(:time) ? value : super
             return if value.blank?
-            value.change usec: cast_usec(value)
-          end
-
-          def cast_usec(value)
-            (usec_to_seconds_frction(value) * 1_000_000).to_i
-          end
-
-          def usec_to_seconds_frction(value)
-            (value.usec.to_f / 1_000_000.0).round(precision || 7)
+            value = value.change year: 2000, month: 01, day: 01
+            cast_fractional(value)
           end
 
-          def quote_usec(value)
-            usec_to_seconds_frction(value).to_s.split('.').last
+          def fractional_scale
+            precision
           end
 
         end

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

@@ -0,0 +1,72 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+
+        module TimeValueFractional
+
+          private
+
+          def cast_fractional(value)
+            return value if !value.respond_to?(fractional_property) || value.send(fractional_property).zero?
+            seconds = value.send(fractional_property).to_f / fractional_operator.to_f
+            seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
+            frac_seconds = (seconds * fractional_operator).to_i
+            value.change fractional_property => frac_seconds
+          end
+
+          def quote_fractional(value)
+            seconds = (value.send(fractional_property).to_f / fractional_operator.to_f).round(fractional_scale)
+            seconds.to_s.split('.').last.to(fractional_scale-1)
+          end
+
+          def fractional_property
+            :usec
+          end
+
+          def fractional_digits
+            6
+          end
+
+          def fractional_operator
+            10 ** fractional_digits
+          end
+
+          def fractional_precision
+            0.00333
+          end
+
+          def fractional_scale
+            3
+          end
+
+        end
+
+        module TimeValueFractional2
+
+          include TimeValueFractional
+
+          private
+
+          def fractional_property
+            :nsec
+          end
+
+          def fractional_digits
+            9
+          end
+
+          def fractional_precision
+            0.0000001
+          end
+
+          def fractional_scale
+            precision
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -43,6 +43,10 @@ module ActiveRecord
             [server_quoted, database_quoted].compact.join(SEPARATOR)
           end
 
+          def fully_qualified?
+            parts.compact.size == 4
+          end
+
           def to_s
             quoted
           end
@@ -51,6 +55,10 @@ module ActiveRecord
             parts.map{ |p| quote(p) if p }.join SEPARATOR
           end
 
+          def quoted_raw
+            quote @raw_name
+          end
+
           def ==(o)
             o.class == self.class && o.parts == parts
           end
@@ -110,6 +118,10 @@ module ActiveRecord
           s.to_s.gsub /\'/, "''"
         end
 
+        def quoted_raw(name)
+          SQLServer::Utils::Name.new(name).quoted_raw
+        end
+
         def unquote_string(s)
           s.to_s.gsub(/\'\'/, "'")
         end
@@ -118,18 +130,6 @@ module ActiveRecord
           SQLServer::Utils::Name.new(name)
         end
 
-        def with_sqlserver_db_date_formats
-          old_db_format_date = Date::DATE_FORMATS[:db]
-          old_db_format_time = Time::DATE_FORMATS[:db]
-          date_format = Date::DATE_FORMATS[:_sqlserver_dateformat]
-          Date::DATE_FORMATS[:db] = "#{date_format}"
-          Time::DATE_FORMATS[:db] = "#{date_format} %H:%M:%S"
-          yield
-        ensure
-          Date::DATE_FORMATS[:db] = old_db_format_date
-          Time::DATE_FORMATS[:db] = old_db_format_time
-        end
-
       end
     end
   end

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module SQLServer
       module Version
 
-        VERSION = '4.2.6'
+        VERSION = File.read(File.expand_path("../../../../../VERSION", __FILE__)).chomp
 
       end
     end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -54,7 +54,6 @@ module ActiveRecord
         @visitor = Arel::Visitors::SQLServer.new self
         @prepared_statements = true
         # Our Responsibility
-        @config = config
         @connection_options = config
         connect
         @sqlserver_azure = !!(select_value('SELECT @@version', 'SCHEMA') =~ /Azure/i)
@@ -121,10 +120,11 @@ module ActiveRecord
       end
 
       def disable_referential_integrity
-        do_execute "EXEC sp_MSforeachtable 'ALTER TABLE ? NOCHECK CONSTRAINT ALL'"
+        tables = tables_with_referential_integrity
+        tables.each { |t| do_execute "ALTER TABLE #{t} NOCHECK CONSTRAINT ALL" }
         yield
       ensure
-        do_execute "EXEC sp_MSforeachtable 'ALTER TABLE ? CHECK CONSTRAINT ALL'"
+        tables.each { |t| do_execute "ALTER TABLE #{t} CHECK CONSTRAINT ALL" }
       end
 
       # === Abstract Adapter (Connection Management) ================== #
@@ -162,6 +162,19 @@ module ActiveRecord
 
       # === Abstract Adapter (Misc Support) =========================== #
 
+      def tables_with_referential_integrity
+        schemas_and_tables = select_rows <<-SQL.strip_heredoc
+          SELECT s.name, o.name
+          FROM sys.foreign_keys i
+          INNER JOIN sys.objects o ON i.parent_object_id = o.OBJECT_ID
+          INNER JOIN sys.schemas s ON o.schema_id = s.schema_id
+        SQL
+        schemas_and_tables.map do |schema_table|
+          schema, table = schema_table
+          "#{SQLServer::Utils.quoted_raw(schema)}.#{SQLServer::Utils.quoted_raw(table)}"
+        end
+      end
+
       def pk_and_sequence_for(table_name)
         pk = primary_key(table_name)
         pk ? [pk, nil] : nil
@@ -181,6 +194,16 @@ module ActiveRecord
         @sqlserver_azure
       end
 
+      def database_prefix_remote_server?
+        return false if database_prefix.blank?
+        name = SQLServer::Utils.extract_identifiers(database_prefix)
+        name.fully_qualified? && name.object.blank?
+      end
+
+      def database_prefix
+        @connection_options[:database_prefix]
+      end
+
       def version
         self.class::VERSION
       end
@@ -221,6 +244,14 @@ module ActiveRecord
         # 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|
+          precision = extract_precision(sql_type)
+          SQLServer::Type::DateTime2.new precision: precision
+        end
+        m.register_type              %r{\Adatetimeoffset}i do |sql_type|
+          precision = extract_precision(sql_type)
+          SQLServer::Type::DateTimeOffset.new precision: precision
+        end
         m.register_type              'smalldatetime',     SQLServer::Type::SmallDateTime.new
         m.register_type              %r{\Atime}i do |sql_type|
           scale = extract_scale(sql_type)
@@ -353,8 +384,13 @@ module ActiveRecord
         a, b, c = @database_dateformat.each_char.to_a
         [a, b, c].each { |f| f.upcase! if f == 'y' }
         dateformat = "%#{a}-%#{b}-%#{c}"
-        ::Date::DATE_FORMATS[:_sqlserver_dateformat] = dateformat
-        ::Time::DATE_FORMATS[:_sqlserver_dateformat] = dateformat
+        ::Date::DATE_FORMATS[:_sqlserver_dateformat]     = dateformat
+        ::Time::DATE_FORMATS[:_sqlserver_dateformat]     = dateformat
+        ::Time::DATE_FORMATS[:_sqlserver_time]           = '%H:%M:%S'
+        ::Time::DATE_FORMATS[:_sqlserver_datetime]       = "#{dateformat} %H:%M:%S"
+        ::Time::DATE_FORMATS[:_sqlserver_datetimeoffset] = lambda { |time|
+          time.strftime "#{dateformat} %H:%M:%S.%9N #{time.formatted_offset}"
+        }
       end
 
     end

data/lib/active_record/sqlserver_base.rb

@@ -1,7 +1,6 @@
 module ActiveRecord
-  class Base
-
-    def self.sqlserver_connection(config) #:nodoc:
+  module ConnectionHandling
+    def sqlserver_connection(config) #:nodoc:
       config = config.symbolize_keys
       config.reverse_merge! mode: :dblib
       mode = config[:mode].to_s.downcase.underscore.to_sym
@@ -17,6 +16,5 @@ module ActiveRecord
       end
       ConnectionAdapters::SQLServerAdapter.new(nil, logger, nil, config.merge(mode: mode))
     end
-
   end
 end

data/lib/arel/visitors/sqlserver.rb

@@ -73,6 +73,19 @@ module Arel
         @select_statement = nil
       end
 
+      def visit_Arel_Table o, collector
+        table_name = if o.engine.connection.database_prefix_remote_server?
+          remote_server_table_name(o)
+        else
+          quote_table_name(o.name)
+        end
+        if o.table_alias
+          collector << "#{table_name} #{quote_table_name o.table_alias}"
+        else
+          collector << table_name
+        end
+      end
+
       def visit_Arel_Nodes_JoinSource o, collector
         if o.left
           collector = visit o.left, collector
@@ -185,6 +198,12 @@ module Arel
         column_name ? t[column_name] : nil
       end
 
+      def remote_server_table_name o
+        ActiveRecord::ConnectionAdapters::SQLServer::Utils.extract_identifiers(
+          "#{o.engine.connection.database_prefix}#{o.name}"
+        ).quoted
+      end
+
     end
   end
 end

data/test/cases/adapter_test_sqlserver.rb

@@ -240,6 +240,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   describe 'database statements' do
 
     it "run the database consistency checker useroptions command" do
+      skip 'on azure' if connection_sqlserver_azure?
       keys = [:textsize, :language, :isolation_level, :dateformat]
       user_options = connection.user_options
       keys.each do |key|
@@ -249,6 +250,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it "return a underscored key hash with indifferent access of the results" do
+      skip 'on azure' if connection_sqlserver_azure?
       user_options = connection.user_options
       assert_equal 'read committed', user_options['isolation_level']
       assert_equal 'read committed', user_options[:isolation_level]
@@ -416,5 +418,27 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
 
   end
 
+  describe 'database_prefix_remote_server?' do
+
+    after do
+      connection_options.delete(:database_prefix)
+    end
+
+    it 'returns false if database_prefix is not configured' do
+      assert_equal false, connection.database_prefix_remote_server?
+    end
+
+    it 'returns true if database_prefix has been set' do
+      connection_options[:database_prefix] = "server.database.schema."
+      assert_equal true, connection.database_prefix_remote_server?
+    end
+
+    it 'returns false if database_prefix has been set incorrectly' do
+      connection_options[:database_prefix] = "server.database.schema"
+      assert_equal false, connection.database_prefix_remote_server?
+    end
+
+  end
+
 end