activerecord-sqlserver-adapter 5.2.1 → 7.0.0.0

data/appveyor.yml

@@ -1,12 +1,23 @@
+image: Visual Studio 2017
+skip_tags: true
+clone_depth: 5
+build: off
+matrix:
+  fast_finish: true
+  allow_failures:
+    - ruby_version: "27"
+    - ruby_version: "27-x64"
+    - ruby_version: "30"
+    - ruby_version: "30-x64"
+services:
+  - mssql2014
+
 init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TINYTDS_VERSION=2.1.0
-clone_depth: 5
-skip_tags: true
-matrix:
-  fast_finish: true
+  - SET TINYTDS_VERSION=2.1.3.pre
+
 install:
   - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
   - ruby --version
@@ -14,26 +25,20 @@ install:
   - bundle install
   - gem uninstall bcrypt
   - gem install bcrypt --platform=ruby
-build: off
+
 test_script:
   - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
   - timeout /t 4 /nobreak > NUL
-  - ps: Start-Service 'MSSQL$SQL2014'
-  - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
-  - ps: Stop-Service 'MSSQL$SQL2014'
-  - ps: Start-Service 'MSSQL$SQL2012SP1'
-  - timeout /t 4 /nobreak > NUL
-  - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
-  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
+
 environment:
   CI_AZURE_HOST:
     secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=
   CI_AZURE_PASS:
     secure: cSQp8sk4urJYvq0utpsK+r7J+snJ2wpcdp8RdXJfB+w=
   matrix:
-    - ruby_version: "23-x64"
-    - ruby_version: "23"
-    - ruby_version: "22-x64"
-    - ruby_version: "22"
+    - ruby_version: "27-x64"
+    - ruby_version: "27"
+    - ruby_version: "30-x64"
+    - ruby_version: "30"

data/docker-compose.ci.yml

@@ -1,11 +1,13 @@
 version: "2.2"
 services:
-  database:
+  sqlserver:
     image: metaskills/mssql-server-linux-rails
   ci:
     environment:
-      - ACTIVERECORD_UNITTEST_HOST=database
-    build: .
-    command: wait-for database:1433 -- bundle exec rake test
+      - ACTIVERECORD_UNITTEST_HOST=sqlserver
+    build:
+      context: .
+      dockerfile: Dockerfile.ci
+    command: wait-for sqlserver:1433 -- bundle exec rake test
     depends_on:
-      - "database"
+      - "sqlserver"

data/guides/RELEASING.md

@@ -0,0 +1,11 @@
+# Releasing
+
+## Building locally
+
+If you want to build the gem to test it locally run `bundle exec rake build`.
+
+This command will build the gem in `pkg/activerecord-sqlserver-adapter-A.B.C.gem`, where `A.B.C` is the version in `VERSION` file.
+
+## Releasing to RubyGems
+
+Run `bundle exec rake release` to build the gem locally and push the `gem` file to RubyGems.

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

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module ActiveRecord
-
           extend ActiveSupport::Concern
 
           module ClassMethods
-
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
                 connection.execute_procedure(proc_name, *variables)
@@ -15,9 +15,7 @@ module ActiveRecord
                 []
               end
             end
-
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

@@ -1,21 +1,22 @@
-require 'active_record/attribute_methods'
+# frozen_string_literal: true
+
+require "active_record/attribute_methods"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module AttributeMethods
-
-
           private
 
           def attributes_for_update(attribute_names)
+            return super unless self.class.connection.adapter_name == "SQLServer"
+
             super.reject do |name|
               column = self.class.columns_hash[name]
               column && column.respond_to?(:is_identity?) && column.is_identity?
             end
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb

@@ -1,21 +1,24 @@
-require 'active_record/relation'
-require 'active_record/version'
+# frozen_string_literal: true
+
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module Calculations
-
           # Same as original except we don't perform PostgreSQL hack that removes ordering.
           def calculate(operation, column_name)
+            return super unless klass.connection.adapter_name == "SQLServer"
+
             if has_include?(column_name)
               relation = apply_join_dependency
 
               if operation.to_s.downcase == "count"
                 unless distinct_value || distinct_select?(column_name || select_for_count)
                   relation.distinct!
-                  relation.select_values = [ klass.primary_key || table[Arel.star] ]
+                  relation.select_values = [klass.primary_key || table[Arel.star]]
                 end
               end
 
@@ -28,16 +31,9 @@ module ActiveRecord
           private
 
           def build_count_subquery(relation, column_name, distinct)
-            super(relation.unscope(:order), column_name, distinct)
-          end
+            return super unless klass.connection.adapter_name == "SQLServer"
 
-          def type_cast_calculated_value(value, type, operation = nil)
-            case operation
-            when "count"   then value.to_i
-            when "sum"     then type.deserialize(value || 0)
-            when "average" then value&.respond_to?(:to_d) ? value.to_d : value
-            else type.deserialize(value)
-            end
+            super(relation.unscope(:order), column_name, distinct)
           end
         end
       end
@@ -47,5 +43,5 @@ end
 
 ActiveSupport.on_load(:active_record) do
   mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Calculations
-  ActiveRecord::Relation.prepend(mod)
+  ActiveRecord::Relation.include(mod)
 end

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module Explain
-
-          SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '.freeze
+          SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
           SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries)
+            return super unless connection.adapter_name == "SQLServer"
+
             unprepared_queries = queries.map do |(sql, binds)|
               [unprepare_sqlserver_statement(sql, binds), binds]
             end
@@ -20,19 +23,23 @@ module ActiveRecord
           # which uses sp_executesql to just the first argument, then unquote it. Likewise our
           # `sp_executesql` method should substitude the @n args with the quoted values.
           def unprepare_sqlserver_statement(sql, binds)
-            return sql unless sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
+            return sql unless sql.start_with?(SQLSERVER_STATEMENT_PREFIX)
 
             executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
             executesql = executesql.match(SQLSERVER_STATEMENT_REGEXP).to_a[1]
 
             binds.each_with_index do |bind, index|
-              value = connection.quote(bind)
+
+              value = if bind.is_a?(::ActiveModel::Attribute)  then
+                connection.quote(bind.value_for_database)
+              else
+                connection.quote(bind)
+              end
               executesql = executesql.sub("@#{index}", value)
             end
 
             executesql
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport.on_load(:active_record) do
   silence_warnings do
     # Already defined in Rails

data/lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb

@@ -1,23 +1,26 @@
-require 'active_record/relation'
-require 'active_record/version'
+# frozen_string_literal: true
+
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module FinderMethods
-
           private
 
           # Same as original except we order by values in distinct select if present.
           def construct_relation_for_exists(conditions)
-            if distinct_value && offset_value
-              relation = limit!(1)
+            return super unless klass.connection.adapter_name == "SQLServer"
 
+            conditions = sanitize_forbidden_attributes(conditions)
+
+            if distinct_value && offset_value
               if select_values.present?
-                relation = relation.order(*select_values)
+                relation = order(*select_values).limit!(1)
               else
-                relation = relation.except(:order)
+                relation = except(:order).limit!(1)
               end
             else
               relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)

data/lib/active_record/connection_adapters/sqlserver/core_ext/preloader.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "active_record/associations/preloader"
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module LoaderQuery
+          def load_records_for_keys(keys, &block)
+            return super unless scope.connection.adapter_name == "SQLServer"
+
+            keys.each_slice(in_clause_length).flat_map do |slice|
+              scope.where(association_key_name => slice).load(&block).records
+            end
+          end
+
+          def in_clause_length
+            10_000
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::LoaderQuery
+  ActiveRecord::Associations::Preloader::Association::LoaderQuery.prepend(mod)
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
@@ -9,10 +11,12 @@ module ActiveRecord
         def column_name_length
           128
         end
+        deprecate :column_name_length
 
         def table_name_length
           128
         end
+        deprecate :table_name_length
 
         def index_name_length
           128
@@ -21,26 +25,27 @@ module ActiveRecord
         def columns_per_table
           1024
         end
+        deprecate :columns_per_table
 
         def indexes_per_table
           999
         end
+        deprecate :indexes_per_table
 
         def columns_per_multicolumn_index
           16
         end
-
-        def in_clause_length
-          10_000
-        end
+        deprecate :columns_per_multicolumn_index
 
         def sql_query_length
           65_536 * 4_096
         end
+        deprecate :sql_query_length
 
         def joins_per_query
           256
         end
+        deprecate :joins_per_query
 
         private