activerecord-jdbcsqlserver-adapter 50.0.0 → 52.0.0

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

@@ -5,10 +5,13 @@ module ActiveRecord
       module ColumnMethods
 
         def primary_key(name, type = :primary_key, **options)
-          return super unless type == :uuid
-          options[:default] = options.fetch(:default, 'NEWID()')
-          options[:primary_key] = true
-          column name, type, options
+          if [:integer, :bigint].include?(type)
+            options[:is_identity] = true unless options.key?(:default)
+          elsif type == :uuid
+            options[:default] = options.fetch(:default, 'NEWID()')
+            options[:primary_key] = true
+          end
+          super
         end
 
         def primary_key_nonclustered(*args, **options)
@@ -98,9 +101,14 @@ module ActiveRecord
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         include ColumnMethods
 
-        def new_column_definition(name, type, options)
-          type = :datetime2 if type == :datetime && options[:precision]
-          super name, type, options
+        def new_column_definition(name, type, **options)
+          case type
+          when :datetime
+            type = :datetime2 if options[:precision]
+          when :primary_key
+            options[:is_identity] = true
+          end
+          super
         end
       end
 

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

@@ -26,13 +26,13 @@ module ActiveRecord
 
     end
 
-    Transaction.send :include, SQLServerTransaction
+    Transaction.send :prepend, SQLServerTransaction
 
     module SQLServerRealTransaction
 
       attr_reader :starting_isolation_level
 
-      def initialize(connection, options, run_commit_callbacks: false)
+      def initialize(connection, options, *args)
         @connection = connection
         @starting_isolation_level = current_isolation_level if options[:isolation]
         super
@@ -58,7 +58,6 @@ module ActiveRecord
 
     end
 
-    RealTransaction.send :include, SQLServerRealTransaction
-
+    RealTransaction.send :prepend, SQLServerRealTransaction
   end
 end

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

@@ -4,10 +4,6 @@ module ActiveRecord
       module Type
         class BigInteger < Integer
 
-          def type
-            :bigint
-          end
-
           def sqlserver_type
             'bigint'.freeze
           end

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

@@ -23,6 +23,11 @@ module ActiveRecord
             @value.inspect
           end
 
+          def eql?(other)
+            self.class == other.class && self.value == other.value
+          end
+          alias :== :eql?
+
         end
       end
     end

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

@@ -51,7 +51,9 @@ module ActiveRecord
           private
 
           def fast_string_to_time(string)
-            fast_string_to_time_zone.strptime(string, fast_string_to_time_format).time
+            time = ActiveSupport::TimeZone['UTC'].strptime(string, fast_string_to_time_format)
+            new_time(time.year, time.month, time.day, time.hour,
+                     time.min, time.sec, Rational(time.nsec, 1_000))
           rescue ArgumentError
             super
           end
@@ -59,11 +61,6 @@ module ActiveRecord
           def fast_string_to_time_format
             "#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N".freeze
           end
-
-          def fast_string_to_time_zone
-            ::Time.zone || ActiveSupport::TimeZone['UTC']
-          end
-
         end
       end
     end

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

@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
-        class Json < ActiveRecord::Type::Internal::AbstractJson
+        class Json < ActiveRecord::Type::Json
 
         end
       end

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

@@ -4,6 +4,13 @@ module ActiveRecord
       module Type
         class String < ActiveRecord::Type::String
 
+          def changed_in_place?(raw_old_value, new_value)
+            if raw_old_value.is_a?(Data)
+              raw_old_value.value != new_value
+            else
+              super
+            end
+          end
 
         end
       end

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

@@ -20,6 +20,7 @@ module ActiveRecord
 
             # Currently only called from our custom Time type for formatting
             def _formatted(value)
+              return "#{value.to_s(:_sqlserver_time)}" unless precision
               "#{value.to_s(:_sqlserver_time)}.#{quote_fractional(value)}"
             end
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -3,9 +3,12 @@ require 'active_record'
 require 'arel_sqlserver'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
+require 'active_record/connection_adapters/sqlserver/core_ext/calculations'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain' unless defined? JRUBY_VERSION
 require 'active_record/connection_adapters/sqlserver/core_ext/explain_subscriber'
 require 'active_record/connection_adapters/sqlserver/core_ext/attribute_methods'
+require 'active_record/connection_adapters/sqlserver/core_ext/finder_methods'
+require 'active_record/connection_adapters/sqlserver/core_ext/query_methods'
 require 'active_record/connection_adapters/sqlserver/version'
 require 'active_record/connection_adapters/sqlserver/type'
 require 'active_record/connection_adapters/sqlserver/database_limits'
@@ -33,7 +36,6 @@ module ActiveRecord
               SQLServer::Quoting,
               SQLServer::DatabaseStatements,
               SQLServer::Showplan,
-              SQLServer::SchemaDumper,
               SQLServer::SchemaStatements,
               SQLServer::DatabaseLimits,
               SQLServer::DatabaseTasks
@@ -52,15 +54,20 @@ module ActiveRecord
 
       ADAPTER_NAME = 'SQLServer'.freeze
 
+      # Default precision for 'time' (See https://docs.microsoft.com/en-us/sql/t-sql/data-types/time-transact-sql)
+      DEFAULT_TIME_PRECISION = 7
+
       attr_reader :spid
 
       cattr_accessor :cs_equality_operator, instance_accessor: false
       cattr_accessor :use_output_inserted, instance_accessor: false
+      cattr_accessor :exclude_output_inserted_table_names, instance_accessor: false
       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
+      self.exclude_output_inserted_table_names = Concurrent::Map.new { false }
 
       def initialize(connection, logger = nil, config = {})
         super(connection, logger, config)
@@ -85,14 +92,6 @@ module ActiveRecord
         SQLServer::SchemaCreation.new self
       end
 
-      def supports_migrations?
-        true
-      end
-
-      def supports_primary_key?
-        true
-      end
-
       def supports_ddl_transactions?
         true
       end
@@ -153,16 +152,20 @@ module ActiveRecord
         false
       end
 
+      def supports_savepoints?
+        true
+      end
+
       def supports_in_memory_oltp?
         @version_year >= 2014
       end
 
       def disable_referential_integrity
         tables = tables_with_referential_integrity
-        tables.each { |t| do_execute "ALTER TABLE #{t} NOCHECK CONSTRAINT ALL" }
+        tables.each { |t| do_execute "ALTER TABLE #{quote_table_name(t)} NOCHECK CONSTRAINT ALL" }
         yield
       ensure
-        tables.each { |t| do_execute "ALTER TABLE #{t} CHECK CONSTRAINT ALL" }
+        tables.each { |t| do_execute "ALTER TABLE #{quote_table_name(t)} CHECK CONSTRAINT ALL" }
       end
 
       # === Abstract Adapter (Connection Management) ================== #
@@ -206,7 +209,7 @@ module ActiveRecord
 
       def tables_with_referential_integrity
         schemas_and_tables = select_rows <<-SQL.strip_heredoc
-          SELECT s.name AS schema_name, o.name AS table_name
+          SELECT DISTINCT s.name AS schema_name, o.name AS table_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
@@ -229,7 +232,7 @@ module ActiveRecord
       end
 
       def sqlserver_azure?
-        @sqlserver_azure ||= !!(select_value('SELECT @@version', 'SCHEMA') =~ /Azure/i)
+        !!(sqlserver_version =~ /Azure/i)
       end
 
       def database_prefix_remote_server?
@@ -242,6 +245,14 @@ module ActiveRecord
         @connection_options[:database_prefix]
       end
 
+      def database_prefix_identifier(name)
+        if database_prefix_remote_server?
+          SQLServer::Utils.extract_identifiers("#{database_prefix}#{name}")
+        else
+          SQLServer::Utils.extract_identifiers(name)
+        end
+      end
+
       def version
         self.class::VERSION
       end
@@ -262,7 +273,7 @@ module ActiveRecord
 
       # === Abstract Adapter (Misc Support) =========================== #
 
-      def initialize_type_map(m)
+      def initialize_type_map(m = type_map)
         m.register_type              %r{.*},            SQLServer::Type::UnicodeString.new
         # Exact Numerics
         register_class_with_limit m, 'bigint(8)',         SQLServer::Type::BigInteger
@@ -302,8 +313,7 @@ module ActiveRecord
         end
         m.register_type              'smalldatetime',     SQLServer::Type::SmallDateTime.new
         m.register_type              %r{\Atime}i do |sql_type|
-          scale = extract_scale(sql_type)
-          precision = extract_precision(sql_type)
+          precision = extract_precision(sql_type) || DEFAULT_TIME_PRECISION
           SQLServer::Type::Time.new precision: precision
         end
         # Character Strings
@@ -339,6 +349,20 @@ module ActiveRecord
           NoDatabaseError.new(message)
         when /data would be truncated/
           ValueTooLong.new(message)
+        when /Column '(.*)' is not the same data type as referencing column '(.*)' in foreign key/
+          pk_id, fk_id = SQLServer::Utils.extract_identifiers($1), SQLServer::Utils.extract_identifiers($2)
+          MismatchedForeignKey.new(
+            self,
+            message: message,
+            table: fk_id.schema,
+            foreign_key: fk_id.object,
+            target_table: pk_id.schema,
+            primary_key: pk_id.object
+          )
+        when /Cannot insert the value NULL into column.*does not allow nulls/
+          NotNullViolation.new(message)
+        when /Arithmetic overflow error/
+          RangeError.new(message)
         else
           super
         end
@@ -430,16 +454,15 @@ module ActiveRecord
       end
 
       def version_year
-        return @version_year if defined?(@version_year)
-        @version_year = begin
-          vstring = _raw_select('SELECT @@version', fetch: :rows).first.first.to_s
-          return 2016 if vstring =~ /vNext/
-          /SQL Server (\d+)/.match(vstring).to_a.last.to_s.to_i
-        rescue Exception => e
-          2016
-        end
+        return 2016 if sqlserver_version =~ /vNext/
+        /SQL Server (\d+)/.match(sqlserver_version).to_a.last.to_s.to_i
+      rescue StandardError => e
+        2016
       end
 
+      def sqlserver_version
+        @sqlserver_version ||= _raw_select('SELECT @@version', fetch: :rows).first.first.to_s
+      end
     end
   end
 end

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -48,10 +48,12 @@ module ActiveRecord
         create true
       end
 
-      def structure_dump(filename)
+      def structure_dump(filename, extra_flags)
+        server_arg = "-S #{Shellwords.escape(configuration['host'])}"
+        server_arg += ":#{Shellwords.escape(configuration['port'])}" if configuration['port']
         command = [
           "defncopy",
-          "-S #{Shellwords.escape(configuration['host'])}",
+          server_arg,
           "-D #{Shellwords.escape(configuration['database'])}",
           "-U #{Shellwords.escape(configuration['username'])}",
           "-P #{Shellwords.escape(configuration['password'])}",
@@ -71,7 +73,7 @@ module ActiveRecord
         File.open(filename, "w") { |file| file.puts dump }
       end
 
-      def structure_load(filename)
+      def structure_load(filename, extra_flags)
         connection.execute File.read(filename)
       end
 

data/lib/activerecord-jdbcsqlserver-adapter.rb

@@ -1,8 +1,11 @@
 # Our core date/time overrides to support prepared statements
 require 'active_record/connection_adapters/sqlserver/core_ext/date_time'
 
+require 'active_support' # Need this for the next line
+require 'active_record/log_subscriber' # Need to make sure this is loaded before we load Core for monkey patching
+
 # Load the jar file for the jdbc driver
-require 'jdbc/mssql'
+require_relative './jdbc_mssql_driver_loader'
 
 # Standadard arjdbc functionality
 require 'arjdbc/abstract/connection_management'

data/lib/arel/visitors/sqlserver.rb

@@ -14,7 +14,7 @@ module Arel
       # SQLServer ToSql/Visitor (Overides)
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| "@#{i-1}" }
+        collector.add_bind(o.value) { |i| "@#{i-1}" }
       end unless defined? JRUBY_VERSION # converts bind argument markers "?" to "@n", but JDBC wants "?"
 
       def visit_Arel_Nodes_Bin o, collector
@@ -95,17 +95,29 @@ module Arel
           collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector
         end
         if o.right.any?
-          collector << " " if o.left
+          collector << SPACE if o.left
           collector = inject_join o.right, collector, ' '
         end
         collector
       end
 
+      def visit_Arel_Nodes_InnerJoin o, collector
+        collector << "INNER JOIN "
+        collector = visit o.left, collector
+        collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
+        if o.right
+          collector << SPACE
+          visit(o.right, collector)
+        else
+          collector
+        end
+      end
+
       def visit_Arel_Nodes_OuterJoin o, collector
         collector << "LEFT OUTER JOIN "
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
-        collector << " "
+        collector << SPACE
         visit o.right, collector
       end
 
@@ -190,7 +202,8 @@ module Arel
 
       def primary_Key_From_Table t
         return unless t
-        column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
+        column_name = @connection.schema_cache.primary_keys(t.name) ||
+          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
         column_name ? t[column_name] : nil
       end
 

data/lib/arel_sqlserver.rb

@@ -1,3 +1,2 @@
 require 'arel'
-require 'arel/visitors/bind_visitor'
 require 'arel/visitors/sqlserver'

data/lib/jdbc_mssql_driver_loader.rb

@@ -0,0 +1,22 @@
+module JdbcMssqlDriverLoader
+  def self.check_and_maybe_load_driver
+    driver_name = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+    if (Java::JavaClass.for_name(driver_name) rescue nil)
+      driver = Java::ComMicrosoftSqlserverJdbc::SQLServerDriver.new
+      which = driver
+        .getClass().getClassLoader().loadClass(driver_name)
+        .getProtectionDomain().getCodeSource().getLocation().to_s
+      warn "You already required a mssql jdbc driver (#{which}), skipping gem jdbc-mssql"
+
+      major_version = driver.major_version
+      required_major_version = 8
+      if major_version < required_major_version
+        raise "MSSQL jdbc driver version is to old (given major version #{major_version} < required major version #{required_major_version})"
+      end
+    else
+      require "jdbc/mssql"
+    end
+  end
+
+  check_and_maybe_load_driver
+end

data/test/bin/install-freetds.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+FREETDS_VERSION=1.00.21
+
+wget http://www.freetds.org/files/stable/freetds-$FREETDS_VERSION.tar.gz
+tar -xzf freetds-$FREETDS_VERSION.tar.gz
+cd freetds-$FREETDS_VERSION
+./configure --prefix=/opt/local \
+            --with-openssl=/opt/local \
+            --with-tdsver=7.3
+make
+make install
+cd ..
+rm -rf freetds-$FREETDS_VERSION
+rm freetds-$FREETDS_VERSION.tar.gz