activerecord-sqlserver-adapter 5.2.1 → 6.0.2

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

@@ -1,19 +1,20 @@
-require 'active_record/connection_adapters/sqlserver/showplan/printer_table'
-require 'active_record/connection_adapters/sqlserver/showplan/printer_xml'
+# frozen_string_literal: true
+
+require "active_record/connection_adapters/sqlserver/showplan/printer_table"
+require "active_record/connection_adapters/sqlserver/showplan/printer_xml"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Showplan
-
-        OPTION_ALL  = 'SHOWPLAN_ALL'
-        OPTION_TEXT = 'SHOWPLAN_TEXT'
-        OPTION_XML  = 'SHOWPLAN_XML'
+        OPTION_ALL  = "SHOWPLAN_ALL"
+        OPTION_TEXT = "SHOWPLAN_TEXT"
+        OPTION_XML  = "SHOWPLAN_XML"
         OPTIONS = [OPTION_ALL, OPTION_TEXT, OPTION_XML]
 
         def explain(arel, binds = [])
           sql = to_sql(arel)
-          result = with_showplan_on { sp_executesql(sql, 'EXPLAIN', binds) }
+          result = with_showplan_on { sp_executesql(sql, "EXPLAIN", binds) }
           printer = showplan_printer.new(result)
           printer.pp
         end
@@ -59,7 +60,6 @@ module ActiveRecord
           else PrinterTable
           end
         end
-
       end
     end
   end

data/lib/active_record/connection_adapters/sqlserver/showplan/printer_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
@@ -41,7 +43,7 @@ module ActiveRecord
           end
 
           def build_separator
-            '+' + @widths.map { |w| '-' * (w + (cell_padding * 2)) }.join('+') + '+'
+            "+" + @widths.map { |w| "-" * (w + (cell_padding * 2)) }.join("+") + "+"
           end
 
           def build_cells(items)
@@ -54,7 +56,7 @@ module ActiveRecord
 
           def cast_item(item)
             case item
-            when NilClass then 'NULL'
+            when NilClass then "NULL"
             when Float then item.to_s.to(9)
             else item.to_s.truncate(max_column_width)
             end

data/lib/active_record/connection_adapters/sqlserver/showplan/printer_xml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
@@ -10,7 +12,7 @@ module ActiveRecord
           def pp
             xml = @result.rows.first.first
             if defined?(Nokogiri)
-              Nokogiri::XML(xml).to_xml indent: 2, encoding: 'UTF-8'
+              Nokogiri::XML(xml).to_xml indent: 2, encoding: "UTF-8"
             else
               xml
             end

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

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       class SqlTypeMetadata < ActiveRecord::ConnectionAdapters::SqlTypeMetadata
-
         def initialize(**kwargs)
           @sqlserver_options = kwargs.extract!(:sqlserver_options)
           super(**kwargs)
@@ -13,7 +14,6 @@ module ActiveRecord
         def attributes_for_hash
           super + [@sqlserver_options]
         end
-
       end
     end
   end

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

@@ -1,101 +1,100 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
-
       module ColumnMethods
-
         def primary_key(name, type = :primary_key, **options)
           if [:integer, :bigint].include?(type)
             options[:is_identity] = true unless options.key?(:default)
           elsif type == :uuid
-            options[:default] = options.fetch(:default, 'NEWID()')
+            options[:default] = options.fetch(:default, "NEWID()")
             options[:primary_key] = true
           end
           super
         end
 
-        def primary_key_nonclustered(*args, **options)
-          args.each { |name| column(name, :primary_key_nonclustered, options) }
+        def primary_key_nonclustered(*names, **options)
+          names.each { |name| column(name, :primary_key_nonclustered, **options) }
         end
 
-        def real(*args, **options)
-          args.each { |name| column(name, :real, options) }
+        def real(*names, **options)
+          names.each { |name| column(name, :real, **options) }
         end
 
-        def money(*args, **options)
-          args.each { |name| column(name, :money, options) }
+        def money(*names, **options)
+          names.each { |name| column(name, :money, **options) }
         end
 
-        def smalldatetime(*args, **options)
-          args.each { |name| column(name, :smalldatetime, options) }
+        def smalldatetime(*names, **options)
+          names.each { |name| column(name, :smalldatetime, **options) }
         end
 
-        def datetime(*args, **options)
-          args.each do |name|
+        def datetime(*names, **options)
+          names.each do |name|
             if options[:precision]
-              datetime2(name, options)
+              datetime2(name, **options)
             else
-              column(name, :datetime, options)
+              column(name, :datetime, **options)
             end
           end
         end
 
-        def datetime2(*args, **options)
-          args.each { |name| column(name, :datetime2, options) }
+        def datetime2(*names, **options)
+          names.each { |name| column(name, :datetime2, **options) }
         end
 
-        def datetimeoffset(*args, **options)
-          args.each { |name| column(name, :datetimeoffset, options) }
+        def datetimeoffset(*names, **options)
+          names.each { |name| column(name, :datetimeoffset, **options) }
         end
 
-        def smallmoney(*args, **options)
-          args.each { |name| column(name, :smallmoney, options) }
+        def smallmoney(*names, **options)
+          names.each { |name| column(name, :smallmoney, **options) }
         end
 
-        def char(*args, **options)
-          args.each { |name| column(name, :char, options) }
+        def char(*names, **options)
+          names.each { |name| column(name, :char, **options) }
         end
 
-        def varchar(*args, **options)
-          args.each { |name| column(name, :varchar, options) }
+        def varchar(*names, **options)
+          names.each { |name| column(name, :varchar, **options) }
         end
 
-        def varchar_max(*args, **options)
-          args.each { |name| column(name, :varchar_max, options) }
+        def varchar_max(*names, **options)
+          names.each { |name| column(name, :varchar_max, **options) }
         end
 
-        def text_basic(*args, **options)
-          args.each { |name| column(name, :text_basic, options) }
+        def text_basic(*names, **options)
+          names.each { |name| column(name, :text_basic, **options) }
         end
 
-        def nchar(*args, **options)
-          args.each { |name| column(name, :nchar, options) }
+        def nchar(*names, **options)
+          names.each { |name| column(name, :nchar, **options) }
         end
 
-        def ntext(*args, **options)
-          args.each { |name| column(name, :ntext, options) }
+        def ntext(*names, **options)
+          names.each { |name| column(name, :ntext, **options) }
         end
 
-        def binary_basic(*args, **options)
-          args.each { |name| column(name, :binary_basic, options) }
+        def binary_basic(*names, **options)
+          names.each { |name| column(name, :binary_basic, **options) }
         end
 
-        def varbinary(*args, **options)
-          args.each { |name| column(name, :varbinary, options) }
+        def varbinary(*names, **options)
+          names.each { |name| column(name, :varbinary, **options) }
         end
 
-        def uuid(*args, **options)
-          args.each { |name| column(name, :uniqueidentifier, options) }
+        def uuid(*names, **options)
+          names.each { |name| column(name, :uniqueidentifier, **options) }
         end
 
-        def ss_timestamp(*args, **options)
-          args.each { |name| column(name, :ss_timestamp, options) }
+        def ss_timestamp(*names, **options)
+          names.each { |name| column(name, :ss_timestamp, **options) }
         end
 
-        def json(*args, **options)
-          args.each { |name| column(name, :text, options) }
+        def json(*names, **options)
+          names.each { |name| column(name, :text, **options) }
         end
-
       end
 
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition

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

@@ -1,10 +1,10 @@
-require 'active_record/connection_adapters/abstract/transaction'
+# frozen_string_literal: true
+
+require "active_record/connection_adapters/abstract/transaction"
 
 module ActiveRecord
   module ConnectionAdapters
-
     module SQLServerTransaction
-
       private
 
       def sqlserver?
@@ -13,26 +13,25 @@ module ActiveRecord
 
       def current_isolation_level
         return unless sqlserver?
+
         level = connection.user_options_isolation_level
         # When READ_COMMITTED_SNAPSHOT is set to ON,
         # user_options_isolation_level will be equal to 'read committed
         # snapshot' which is not a valid isolation level
-        if level.blank? || level == 'read committed snapshot'
-          'READ COMMITTED'
+        if level.blank? || level == "read committed snapshot"
+          "READ COMMITTED"
         else
           level.upcase
         end
       end
-
     end
 
     Transaction.send :prepend, SQLServerTransaction
 
     module SQLServerRealTransaction
-
       attr_reader :starting_isolation_level
 
-      def initialize(connection, options, *args)
+      def initialize(connection, options, **args)
         @connection = connection
         @starting_isolation_level = current_isolation_level if options[:isolation]
         super
@@ -55,7 +54,6 @@ module ActiveRecord
           connection.set_transaction_isolation_level(starting_isolation_level)
         end
       end
-
     end
 
     RealTransaction.send :prepend, SQLServerRealTransaction

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

@@ -1,46 +1,49 @@
-require 'active_record/type'
+# frozen_string_literal: true
+
+require "active_record/type"
 # Behaviors
-require 'active_record/connection_adapters/sqlserver/type/data'
-require 'active_record/connection_adapters/sqlserver/type/time_value_fractional'
+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'
-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'
+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/decimal_without_scale"
+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'
-require 'active_record/connection_adapters/sqlserver/type/real'
+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/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'
+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'
-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'
+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'
-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'
+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'
-require 'active_record/connection_adapters/sqlserver/type/varbinary'
-require 'active_record/connection_adapters/sqlserver/type/varbinary_max'
+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'
-require 'active_record/connection_adapters/sqlserver/type/timestamp'
-require 'active_record/connection_adapters/sqlserver/type/json'
+require "active_record/connection_adapters/sqlserver/type/uuid"
+require "active_record/connection_adapters/sqlserver/type/timestamp"
+require "active_record/connection_adapters/sqlserver/type/json"
 
 module ActiveRecord
   module Type

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

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
         class BigInteger < Integer
-
           def sqlserver_type
-            'bigint'.freeze
+            "bigint"
           end
-
         end
       end
     end

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

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
         class Binary < ActiveRecord::Type::Binary
-
           def type
             :binary_basic
           end
 
           def sqlserver_type
-            'binary'.tap do |type|
-              type << "(#{limit})" if limit
+            "binary".yield_self do |type|
+              type += "(#{limit})" if limit
+              type
             end
           end
-
         end
       end
     end

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

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
         class Boolean < ActiveRecord::Type::Boolean
-
           def sqlserver_type
-            'bit'.freeze
+            "bit"
           end
-
         end
       end
     end

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
         class Char < String
-
           def type
             :char
           end
@@ -11,20 +12,22 @@ module ActiveRecord
           def serialize(value)
             return if value.nil?
             return value if value.is_a?(Data)
+
             Data.new super, self
           end
 
           def sqlserver_type
-            'char'.tap do |type|
-              type << "(#{limit})" if limit
+            "char".yield_self do |type|
+              type += "(#{limit})" if limit
+              type
             end
           end
 
           def quoted(value)
             return value.quoted_id if value.respond_to?(:quoted_id)
+
             Utils.quote_string_single(value)
           end
-
         end
       end
     end