activerecord-sqlserver-adapter 6.0.0.rc1 → 6.0.0.rc2

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

@@ -4,9 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Version
-
         VERSION = File.read(File.expand_path("../../../../../VERSION", __FILE__)).chomp
-
       end
     end
   end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -1,40 +1,39 @@
 # frozen_string_literal: true
 
-require 'base64'
-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'
-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/core_ext/preloader'
-require 'active_record/connection_adapters/sqlserver/version'
-require 'active_record/connection_adapters/sqlserver/type'
-require 'active_record/connection_adapters/sqlserver/database_limits'
-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_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'
-require 'active_record/connection_adapters/sqlserver/utils'
-require 'active_record/sqlserver_base'
-require 'active_record/connection_adapters/sqlserver_column'
-require 'active_record/tasks/sqlserver_database_tasks'
+require "base64"
+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"
+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/core_ext/preloader"
+require "active_record/connection_adapters/sqlserver/version"
+require "active_record/connection_adapters/sqlserver/type"
+require "active_record/connection_adapters/sqlserver/database_limits"
+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_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"
+require "active_record/connection_adapters/sqlserver/utils"
+require "active_record/sqlserver_base"
+require "active_record/connection_adapters/sqlserver_column"
+require "active_record/tasks/sqlserver_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
     class SQLServerAdapter < AbstractAdapter
-
       include SQLServer::Version,
               SQLServer::Quoting,
               SQLServer::DatabaseStatements,
@@ -43,7 +42,7 @@ module ActiveRecord
               SQLServer::DatabaseLimits,
               SQLServer::DatabaseTasks
 
-      ADAPTER_NAME = 'SQLServer'.freeze
+      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
@@ -56,7 +55,7 @@ module ActiveRecord
       cattr_accessor :showplan_option, instance_accessor: false
       cattr_accessor :lowercase_schema_reflection
 
-      self.cs_equality_operator = 'COLLATE Latin1_General_CS_AS_WS'
+      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 }
 
@@ -189,7 +188,8 @@ module ActiveRecord
 
       def active?
         return false unless @connection
-        raw_connection_do 'SELECT 1'
+
+        raw_connection_do "SELECT 1"
         true
       rescue *connection_errors
         false
@@ -219,7 +219,7 @@ module ActiveRecord
 
       def reset!
         reset_transaction
-        do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
+        do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
       end
 
       # === Abstract Adapter (Misc Support) =========================== #
@@ -254,6 +254,7 @@ module ActiveRecord
 
       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
@@ -294,31 +295,31 @@ module ActiveRecord
       # === Abstract Adapter (Misc Support) =========================== #
 
       def initialize_type_map(m = type_map)
-        m.register_type              %r{.*},            SQLServer::Type::UnicodeString.new
+        m.register_type              %r{.*}, SQLServer::Type::UnicodeString.new
         # Exact Numerics
-        register_class_with_limit m, 'bigint(8)',         SQLServer::Type::BigInteger
-        m.alias_type                 'bigint',            'bigint(8)'
-        register_class_with_limit m, 'int(4)',            SQLServer::Type::Integer
-        m.alias_type                 'integer',           'int(4)'
-        m.alias_type                 'int',               'int(4)'
-        register_class_with_limit m, 'smallint(2)',       SQLServer::Type::SmallInteger
-        m.alias_type                 'smallint',          'smallint(2)'
-        register_class_with_limit m, 'tinyint(1)',        SQLServer::Type::TinyInteger
-        m.alias_type                 'tinyint',           'tinyint(1)'
-        m.register_type              'bit',               SQLServer::Type::Boolean.new
+        register_class_with_limit m, "bigint(8)",         SQLServer::Type::BigInteger
+        m.alias_type                 "bigint",            "bigint(8)"
+        register_class_with_limit m, "int(4)",            SQLServer::Type::Integer
+        m.alias_type                 "integer",           "int(4)"
+        m.alias_type                 "int",               "int(4)"
+        register_class_with_limit m, "smallint(2)",       SQLServer::Type::SmallInteger
+        m.alias_type                 "smallint",          "smallint(2)"
+        register_class_with_limit m, "tinyint(1)",        SQLServer::Type::TinyInteger
+        m.alias_type                 "tinyint",           "tinyint(1)"
+        m.register_type              "bit",               SQLServer::Type::Boolean.new
         m.register_type              %r{\Adecimal}i do |sql_type|
           scale = extract_scale(sql_type)
           precision = extract_precision(sql_type)
           SQLServer::Type::Decimal.new precision: precision, scale: scale
         end
-        m.alias_type                 %r{\Anumeric}i,      'decimal'
-        m.register_type              'money',             SQLServer::Type::Money.new
-        m.register_type              'smallmoney',        SQLServer::Type::SmallMoney.new
+        m.alias_type                 %r{\Anumeric}i,      "decimal"
+        m.register_type              "money",             SQLServer::Type::Money.new
+        m.register_type              "smallmoney",        SQLServer::Type::SmallMoney.new
         # Approximate Numerics
-        m.register_type              'float',             SQLServer::Type::Float.new
-        m.register_type              'real',              SQLServer::Type::Real.new
+        m.register_type              "float",             SQLServer::Type::Float.new
+        m.register_type              "real",              SQLServer::Type::Real.new
         # Date and Time
-        m.register_type              'date',              SQLServer::Type::Date.new
+        m.register_type              "date",              SQLServer::Type::Date.new
         m.register_type              %r{\Adatetime} do |sql_type|
           precision = extract_precision(sql_type)
           if precision
@@ -327,11 +328,11 @@ module ActiveRecord
             SQLServer::Type::DateTime.new
           end
         end
-        m.register_type              %r{\Adatetimeoffset}i do |sql_type|
+        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              "smalldatetime", SQLServer::Type::SmallDateTime.new
         m.register_type              %r{\Atime}i do |sql_type|
           precision = extract_precision(sql_type) || DEFAULT_TIME_PRECISION
           SQLServer::Type::Time.new precision: precision
@@ -339,22 +340,22 @@ module ActiveRecord
         # Character Strings
         register_class_with_limit m, %r{\Achar}i,         SQLServer::Type::Char
         register_class_with_limit m, %r{\Avarchar}i,      SQLServer::Type::Varchar
-        m.register_type              'varchar(max)',      SQLServer::Type::VarcharMax.new
-        m.register_type              'text',              SQLServer::Type::Text.new
+        m.register_type              "varchar(max)",      SQLServer::Type::VarcharMax.new
+        m.register_type              "text",              SQLServer::Type::Text.new
         # Unicode Character Strings
         register_class_with_limit m, %r{\Anchar}i,        SQLServer::Type::UnicodeChar
         register_class_with_limit m, %r{\Anvarchar}i,     SQLServer::Type::UnicodeVarchar
-        m.alias_type                 'string',            'nvarchar(4000)'
-        m.register_type              'nvarchar(max)',     SQLServer::Type::UnicodeVarcharMax.new
-        m.register_type              'nvarchar(max)',     SQLServer::Type::UnicodeVarcharMax.new
-        m.register_type              'ntext',             SQLServer::Type::UnicodeText.new
+        m.alias_type                 "string",            "nvarchar(4000)"
+        m.register_type              "nvarchar(max)",     SQLServer::Type::UnicodeVarcharMax.new
+        m.register_type              "nvarchar(max)",     SQLServer::Type::UnicodeVarcharMax.new
+        m.register_type              "ntext",             SQLServer::Type::UnicodeText.new
         # Binary Strings
         register_class_with_limit m, %r{\Abinary}i,       SQLServer::Type::Binary
         register_class_with_limit m, %r{\Avarbinary}i,    SQLServer::Type::Varbinary
-        m.register_type              'varbinary(max)',    SQLServer::Type::VarbinaryMax.new
+        m.register_type              "varbinary(max)",    SQLServer::Type::VarbinaryMax.new
         # Other Data Types
-        m.register_type              'uniqueidentifier',  SQLServer::Type::Uuid.new
-        m.register_type              'timestamp',         SQLServer::Type::Timestamp.new
+        m.register_type              "uniqueidentifier",  SQLServer::Type::Uuid.new
+        m.register_type              "timestamp",         SQLServer::Type::Timestamp.new
       end
 
       def translate_exception(e, message:, sql:, binds:)
@@ -398,7 +399,7 @@ module ActiveRecord
                       when :dblib
                         dblib_connect(config)
                       end
-        @spid = _raw_select('SELECT @@SPID', fetch: :rows).first.first
+        @spid = _raw_select("SELECT @@SPID", fetch: :rows).first.first
         @version_year = version_year
         configure_connection
       end
@@ -417,32 +418,32 @@ module ActiveRecord
           username: config[:username],
           password: config[:password],
           database: config[:database],
-          tds_version: config[:tds_version] || '7.3',
+          tds_version: config[:tds_version] || "7.3",
           appname: config_appname(config),
           login_timeout: config_login_timeout(config),
           timeout: config_timeout(config),
-          encoding:  config_encoding(config),
+          encoding: config_encoding(config),
           azure: config[:azure],
           contained: config[:contained]
         ).tap do |client|
           if config[:azure]
-            client.execute('SET ANSI_NULLS ON').do
-            client.execute('SET ANSI_NULL_DFLT_ON ON').do
-            client.execute('SET ANSI_PADDING ON').do
-            client.execute('SET ANSI_WARNINGS ON').do
+            client.execute("SET ANSI_NULLS ON").do
+            client.execute("SET ANSI_NULL_DFLT_ON ON").do
+            client.execute("SET ANSI_PADDING ON").do
+            client.execute("SET ANSI_WARNINGS ON").do
           else
-            client.execute('SET ANSI_DEFAULTS ON').do
+            client.execute("SET ANSI_DEFAULTS ON").do
           end
-          client.execute('SET QUOTED_IDENTIFIER ON').do
-          client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
-          client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
-          client.execute('SET TEXTSIZE 2147483647').do
-          client.execute('SET CONCAT_NULL_YIELDS_NULL ON').do
+          client.execute("SET QUOTED_IDENTIFIER ON").do
+          client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+          client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
+          client.execute("SET TEXTSIZE 2147483647").do
+          client.execute("SET CONCAT_NULL_YIELDS_NULL ON").do
         end
       end
 
       def config_appname(config)
-        config[:appname] || configure_application_name || Rails.application.class.name.split('::').first rescue nil
+        config[:appname] || configure_application_name || Rails.application.class.name.split("::").first rescue nil
       end
 
       def config_login_timeout(config)
@@ -457,18 +458,18 @@ module ActiveRecord
         config[:encoding].present? ? config[:encoding] : nil
       end
 
-      def configure_connection ; end
+      def configure_connection; end
 
-      def configure_application_name ; end
+      def configure_application_name; end
 
       def initialize_dateformatter
         @database_dateformat = user_options_dateformat
         a, b, c = @database_dateformat.each_char.to_a
-        [a, b, c].each { |f| f.upcase! if f == 'y' }
+        [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
-        ::Time::DATE_FORMATS[:_sqlserver_time]           = '%H:%M:%S'
+        ::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}"
@@ -477,13 +478,14 @@ module ActiveRecord
 
       def version_year
         return 2016 if sqlserver_version =~ /vNext/
+
         /SQL Server (\d+)/.match(sqlserver_version).to_a.last.to_s.to_i
-      rescue StandardError => e
+      rescue StandardError
         2016
       end
 
       def sqlserver_version
-        @sqlserver_version ||= _raw_select('SELECT @@version', fetch: :rows).first.first.to_s
+        @sqlserver_version ||= _raw_select("SELECT @@version", fetch: :rows).first.first.to_s
       end
     end
   end

data/lib/active_record/connection_adapters/sqlserver_column.rb

@@ -3,7 +3,6 @@
 module ActiveRecord
   module ConnectionAdapters
     class SQLServerColumn < Column
-
       def initialize(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation: nil, comment: nil, **sqlserver_options)
         @sqlserver_options = sqlserver_options
         super
@@ -28,7 +27,6 @@ module ActiveRecord
       def case_sensitive?
         collation && collation.match(/_CS/)
       end
-
     end
   end
 end

data/lib/active_record/sqlserver_base.rb

@@ -8,7 +8,7 @@ module ActiveRecord
       mode = config[:mode].to_s.downcase.underscore.to_sym
       case mode
       when :dblib
-        require 'tiny_tds'
+        require "tiny_tds"
       else
         raise ArgumentError, "Unknown connection mode in #{config.inspect}."
       end

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_record/tasks/database_tasks'
-require 'shellwords'
-require 'ipaddr'
-require 'socket'
+require "active_record/tasks/database_tasks"
+require "shellwords"
+require "ipaddr"
+require "socket"
 
 module ActiveRecord
   module Tasks
-
     class SQLServerDatabaseTasks
-
-      DEFAULT_COLLATION = 'SQL_Latin1_General_CP1_CI_AS'
+      DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS"
 
       delegate :connection, :establish_connection, :clear_active_connections!,
                to: ActiveRecord::Base
@@ -21,10 +19,10 @@ module ActiveRecord
 
       def create(master_established = false)
         establish_master_connection unless master_established
-        connection.create_database configuration['database'], configuration.merge('collation' => default_collation)
+        connection.create_database configuration["database"], configuration.merge("collation" => default_collation)
         establish_connection configuration
-      rescue ActiveRecord::StatementInvalid => error
-        if /database .* already exists/i === error.message
+      rescue ActiveRecord::StatementInvalid => e
+        if /database .* already exists/i === e.message
           raise DatabaseAlreadyExists
         else
           raise
@@ -33,7 +31,7 @@ module ActiveRecord
 
       def drop
         establish_master_connection
-        connection.drop_database configuration['database']
+        connection.drop_database configuration["database"]
       end
 
       def charset
@@ -52,7 +50,7 @@ module ActiveRecord
 
       def structure_dump(filename, extra_flags)
         server_arg = "-S #{Shellwords.escape(configuration['host'])}"
-        server_arg += ":#{Shellwords.escape(configuration['port'])}" if configuration['port']
+        server_arg += ":#{Shellwords.escape(configuration['port'])}" if configuration["port"]
         command = [
           "defncopy-ttds",
           server_arg,
@@ -65,13 +63,14 @@ module ActiveRecord
         command.concat(table_args)
         view_args = connection.views.map { |v| Shellwords.escape(v) }
         command.concat(view_args)
-        raise 'Error dumping database' unless Kernel.system(command.join(' '))
+        raise "Error dumping database" unless Kernel.system(command.join(" "))
+
         dump = File.read(filename)
-        dump.gsub!(/^USE .*$\nGO\n/, '')                      # Strip db USE statements
-        dump.gsub!(/^GO\n/, '')                               # Strip db GO statements
-        dump.gsub!(/nvarchar\(8000\)/, 'nvarchar(4000)')      # Fix nvarchar(8000) column defs
-        dump.gsub!(/nvarchar\(-1\)/, 'nvarchar(max)')         # Fix nvarchar(-1) column defs
-        dump.gsub!(/text\(\d+\)/, 'text')                     # Fix text(16) column defs
+        dump.gsub!(/^USE .*$\nGO\n/, "")                      # Strip db USE statements
+        dump.gsub!(/^GO\n/, "")                               # Strip db GO statements
+        dump.gsub!(/nvarchar\(8000\)/, "nvarchar(4000)")      # Fix nvarchar(8000) column defs
+        dump.gsub!(/nvarchar\(-1\)/, "nvarchar(max)")         # Fix nvarchar(-1) column defs
+        dump.gsub!(/text\(\d+\)/, "text")                     # Fix text(16) column defs
         File.open(filename, "w") { |file| file.puts dump }
       end
 
@@ -79,7 +78,6 @@ module ActiveRecord
         connection.execute File.read(filename)
       end
 
-
       private
 
       def configuration
@@ -87,25 +85,22 @@ module ActiveRecord
       end
 
       def default_collation
-        configuration['collation'] || DEFAULT_COLLATION
+        configuration["collation"] || DEFAULT_COLLATION
       end
 
       def establish_master_connection
-        establish_connection configuration.merge('database' => 'master')
+        establish_connection configuration.merge("database" => "master")
       end
-
     end
 
     module DatabaseTasksSQLServer
-
       extend ActiveSupport::Concern
 
       module ClassMethods
-
         LOCAL_IPADDR = [
-          IPAddr.new('192.168.0.0/16'),
-          IPAddr.new('10.0.0.0/8'),
-          IPAddr.new('172.16.0.0/12')
+          IPAddr.new("192.168.0.0/16"),
+          IPAddr.new("10.0.0.0/8"),
+          IPAddr.new("172.16.0.0/12")
         ]
 
         private
@@ -115,21 +110,20 @@ module ActiveRecord
         end
 
         def configuration_host_ip(configuration)
-          return nil unless configuration['host']
-          Socket::getaddrinfo(configuration['host'], 'echo', Socket::AF_INET)[0][3]
+          return nil unless configuration["host"]
+
+          Socket::getaddrinfo(configuration["host"], "echo", Socket::AF_INET)[0][3]
         end
 
         def local_ipaddr?(host_ip)
           return false unless host_ip
+
           LOCAL_IPADDR.any? { |ip| ip.include?(host_ip) }
         end
-
       end
-
     end
 
     DatabaseTasks.register_task %r{sqlserver}, SQLServerDatabaseTasks
     DatabaseTasks.send :include, DatabaseTasksSQLServer
-
   end
 end