activerecord-sqlserver-adapter 6.1.3.0 → 7.0.0.0.rc1

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -105,7 +105,7 @@ module ActiveRecord
         end
 
         def config_appname(config)
-          if self.instance_methods.include?(:configure_application_name)
+          if instance_methods.include?(:configure_application_name)
             ActiveSupport::Deprecation.warn <<~MSG.squish
             Configuring the application name used by TinyTDS by overriding the
             `ActiveRecord::ConnectionAdapters::SQLServerAdapter#configure_application_name`
@@ -140,7 +140,7 @@ module ActiveRecord
       def initialize(connection, logger, _connection_options, config)
         super(connection, logger, config)
         @connection_options = config
-        perform_connection_configuration
+        configure_connection
       end
 
       # === Abstract Adapter ========================================== #
@@ -301,6 +301,14 @@ module ActiveRecord
         do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
       end
 
+      def configure_connection
+        @spid = _raw_select("SELECT @@SPID", fetch: :rows).first.first
+        @version_year = version_year
+
+        initialize_dateformatter
+        use_database
+      end
+
       # === Abstract Adapter (Misc Support) =========================== #
 
       def tables_with_referential_integrity
@@ -369,83 +377,93 @@ module ActiveRecord
         version_year
       end
 
-      protected
-
-      # === Abstract Adapter (Misc Support) =========================== #
-
-      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
-        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)
-          if scale == 0
-            SQLServer::Type::DecimalWithoutScale.new(precision: precision)
-          else
-            SQLServer::Type::Decimal.new(precision: precision, scale: scale)
+      class << self
+        protected
+
+        def initialize_type_map(m)
+          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
+          m.register_type              %r{\Adecimal}i do |sql_type|
+            scale     = extract_scale(sql_type)
+            precision = extract_precision(sql_type)
+            if scale == 0
+              SQLServer::Type::DecimalWithoutScale.new(precision: precision)
+            else
+              SQLServer::Type::Decimal.new(precision: precision, scale: scale)
+            end
           end
-        end
-        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
-
-        # Date and Time
-        m.register_type              "date",              SQLServer::Type::Date.new
-        m.register_type              %r{\Adatetime} do |sql_type|
-          precision = extract_precision(sql_type)
-          if precision
-            SQLServer::Type::DateTime2.new precision: precision
-          else
-            SQLServer::Type::DateTime.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
+
+          # Date and Time
+          m.register_type              "date",              SQLServer::Type::Date.new
+          m.register_type              %r{\Adatetime} do |sql_type|
+            precision = extract_precision(sql_type)
+            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)
+            SQLServer::Type::DateTimeOffset.new precision: precision
+          end
+          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
+          end
+
+          # 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
+
+          # 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
+
+          # 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
+
+          # Other Data Types
+          m.register_type              "uniqueidentifier",  SQLServer::Type::Uuid.new
+          m.register_type              "timestamp",         SQLServer::Type::Timestamp.new
         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|
-          precision = extract_precision(sql_type) || DEFAULT_TIME_PRECISION
-          SQLServer::Type::Time.new precision: precision
-        end
+      end
 
-        # 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
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map(m) }
 
-        # 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
+      protected
 
-        # 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
+      # === Abstract Adapter (Misc Support) =========================== #
 
-        # Other Data Types
-        m.register_type              "uniqueidentifier",  SQLServer::Type::Uuid.new
-        m.register_type              "timestamp",         SQLServer::Type::Timestamp.new
+      def type_map
+        TYPE_MAP
       end
 
       def translate_exception(e, message:, sql:, binds:)
@@ -459,7 +477,7 @@ module ActiveRecord
         when /has been chosen as the deadlock victim/i
           DeadlockVictim.new(message, sql: sql, binds: binds)
         when /database .* does not exist/i
-          NoDatabaseError.new(message, sql: sql, binds: binds)
+          NoDatabaseError.new(message)
         when /data would be truncated/
           ValueTooLong.new(message, sql: sql, binds: binds)
         when /connection timed out/
@@ -522,20 +540,7 @@ module ActiveRecord
 
       def connect
         @connection = self.class.new_client(@connection_options)
-        perform_connection_configuration
-      end
-
-      def perform_connection_configuration
-        configure_connection_defaults
-        configure_connection if self.respond_to?(:configure_connection)
-      end
-
-      def configure_connection_defaults
-        @spid = _raw_select("SELECT @@SPID", fetch: :rows).first.first
-        @version_year = version_year
-
-        initialize_dateformatter
-        use_database
+        configure_connection
       end
     end
   end

data/lib/arel/visitors/sqlserver.rb

@@ -83,6 +83,8 @@ module Arel
           # Monkey-patch start. Add query attribute bindings rather than just values.
           column_name = o.column_name
           column_type = o.attribute.relation.type_for_attribute(o.column_name)
+          # Use cast_type on encrypted attributes. Don't encrypt them again
+          column_type = column_type.cast_type if column_type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType)
           attrs = values.map { |value| ActiveRecord::Relation::QueryAttribute.new(column_name, value, column_type) }
 
           collector.add_binds(attrs, &bind_block)