activerecord-sqlserver-adapter 7.0.7 → 7.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83388c1406fff2ac06215c523b54148362c6eadfbb56a32555cc36e9a95b42b6
-  data.tar.gz: 9b7230a6317df5393e15adc93486dea74701c38b8d25cb176a6c2961cdd27b86
+  metadata.gz: '009fdf722e06ca141f900257d1980016e76edc153d5af717d5f15ae6792ea4d4'
+  data.tar.gz: 292f605553c6bfbfc357efc6c9e26fca3be1414921d8a4b810ccd17ce46f4e88
 SHA512:
-  metadata.gz: 58c3429ed5900c289e059d6047dfef313b8a91fca2f43bbe2c95004a16b99e5cb9255d9715ac531a34fb2db9c7b7acf77ff81bb9a9c43e3e31e90116f2bc0da8
-  data.tar.gz: 91c41e4809dfca4809cd8899a60d80325310999adce340a70d672aefacd06f61ddc885260908b12a5d444df3cb1008a993276ccd9640f38ff59a6df4cd6c9346
+  metadata.gz: a2c2363f6445554a6067f15ca1467130dfe4499513746e2a1d374c2e27635d68f0eb5c1682cc49621c101c31531723f66c5670e1d73d89b798cb6eda90d52f39
+  data.tar.gz: a788af6fbd28c02f0ab1e9d6283f4a11934f9bb702d93a7428d0d1e37aed4cb9e72f9fba4f4e21c18057b789204a9bfd0cc353b988f1751c8e65689ec8b4b686

data/.github/workflows/ci.yml

@@ -14,8 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1.3
-          - 3.2.1
+          - 3.0.6
+          - 3.1.4
+          - 3.2.2
 
     steps:
       - name: Checkout code

data/CHANGELOG.md

@@ -1,101 +1,9 @@
-## v7.0.7
+## v7.1.0.beta1
 
 #### Changed
 
-- [#1200](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1200) Remove ActiveRecord::Relation#calculate patch
-
-## v7.0.6
-
-#### Added
-
-- [#1141](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1141) Added support for check constraints.
-
-## v7.0.5.1
-
-#### Fixed
-
-- [#1133](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1133) Fix matching view's real column name
-
-## v7.0.5.0
-
-#### Fixed
-
-- [#1113](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1113) Fix issue with default view value not being found because of case sensitivity
-- [#1126](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1113) Fix view issue with default column value not found
-
-## v7.0.4.0
-
-#### Changed
-
-- [#1073](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1073) Improve performance of view default function lookup
-
-#### Fixed
-
-- [#1088](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1088) Fix creation of stored procedures that contain insert statements
-- [#1089](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1089) When changing columns set date-time columns to datetime(6) by default
-
-## v7.0.3.0
-
-#### Fixed
-
-- [#1052](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1052) Ignore casing of VALUES clause when inserting records using SQL
-- [#1053](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1053) Fix insertion of records to non-default schema table using raw SQL
-- [#1059](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1059) Fix enums defined on string columns
-
-#### Changed
-
-- [#1057](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1057) Set precision 6 by default for timestamps.
-
-## v7.0.2.0
-
-[Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/v7.0.1.0...v7.0.2.0)
-
-#### Fixed
-
-- [#1049](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1049) Fix for inserting records into non-dbo schema table.
-
-## v7.0.1.0
-
-[Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/v7.0.0.0...v7.0.1.0)
-
-#### Fixed
-
-- [#1029](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1029) Handle views defined in other databases.
-- [#1033](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1033) Support proc default values in ruby 3.2.
-- [#1020](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1020) Support using adapter as a stand-alone gem.
-- [#1039](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1039) Fix hook method that allows custom connection configuration.
-
-#### Changed
-
-- [#1021](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1021) Freeze the SQL sent to instrumentation.
-
-## v7.0.0.0
-
-[Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/v7.0.0.0.rc1...v7.0.0.0)
-
 #### Fixed
 
-- [#1002](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1002) Fix support for index types
-
-#### Changed
-
-- [#1004](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1004) Dump the precision for datetime columns following the new defaults.
-
-## v7.0.0.0.rc1
-
-[Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/6-1-stable...v7.0.0.0.rc1)
-
-#### Changed
-
-- [#968](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/968) Define adapter type maps statically
-- [#983](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/983) Optimize remove_columns to use a single SQL statement
-- [#984](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/984) Better handle SQL queries with invalid encoding
-- [#988](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/988) Raise `ActiveRecord::StatementInvalid` when `columns` is called with a non-existing table (***breaking change***)
-
 #### Added
 
-- [#972](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/972) Support `ActiveRecord::QueryLogs`
-- [#981](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/981) Support `find_by` an encrypted attribute
-- [#985](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/985) Support string returning clause for `ActiveRecord#insert_all`
-
-Please check [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/6-1-stable/CHANGELOG.md) for previous changes.
+Please check [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-0-stable/CHANGELOG.md) for previous changes.

data/Gemfile

@@ -12,9 +12,12 @@ gem "sqlite3", "~> 1.4"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "benchmark-ips"
 gem "minitest", ">= 5.15.0", "< 5.16"
+gem "msgpack", ">= 1.7.0"
 
 if ENV["RAILS_SOURCE"]
   gemspec path: ENV["RAILS_SOURCE"]
+elsif ENV["RAILS_MAIN"]
+  gem "rails", github: "rails/rails", branch: 'main'
 else
   # Need to get rails source because the gem doesn't include tests
   version = ENV["RAILS_VERSION"] || begin

data/README.md

@@ -11,15 +11,16 @@ The SQL Server adapter for ActiveRecord using SQL Server 2012 or higher.
 
 Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 7.x version of the adapter is only for the latest 7.x version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
 
-| Adapter Version | Rails Version | Support                                                                                     |
-|-----------------| ------------- |---------------------------------------------------------------------------------------------|
-| `7.0.7`         | `7.0.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
-| `6.1.2.1`       | `6.1.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
-| `6.0.3`         | `6.0.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
-| `5.2.1`         | `5.2.x`       | [ended](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable)  |
-| `5.1.6`         | `5.1.x`       | [ended](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable)  |
-| `4.2.18`        | `4.2.x`       | [ended](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable)  |
-| `4.1.8`         | `4.1.x`       | [ended](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-1-stable)  |
+| Adapter Version | Rails Version | Support        | Branch                                                                                          |
+|-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
+| `v7.1.0.beta1`  | `7.1.0`       | In development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)       |
+| `7.0.4.0`       | `7.0.x`       | Active         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
+| `6.1.2.1`       | `6.1.x`       | Active         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
+| `6.0.3`         | `6.0.x`       | Active         | [6-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
+| `5.2.1`         | `5.2.x`       | Ended          | [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |
+| `5.1.6`         | `5.1.x`       | Ended          | [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable) |
+| `4.2.18`        | `4.2.x`       | Ended          | [4-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable) |
+| `4.1.8`         | `4.1.x`       | Ended          | [4-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-1-stable) |
 
 For older versions, please check their stable branches.
 
@@ -89,13 +90,16 @@ end
 
 #### Configure Connection
 
-We currently conform to an unpublished and non-standard AbstractAdapter interface to configure connections made to the database. To do so, just implement the `configure_connection` method in an initializer like so. In this case below we are setting the `TEXTSIZE` to 64 megabytes.
+The adapter conforms to the AbstractAdapter interface to configure connections. If you require additional connection
+configuration then implement the `configure_connection` method in an initializer like so. In the following
+example we are setting the `TEXTSIZE` to 64 megabytes.
 
 ```ruby
 module ActiveRecord
   module ConnectionAdapters
     class SQLServerAdapter < AbstractAdapter
       def configure_connection
+        super
         raw_connection_do "SET TEXTSIZE #{64.megabytes}"
       end
     end
@@ -170,7 +174,8 @@ To then connect the application to your SQL Server instance edit the `config/dat
 
 ## Installation
 
-The adapter has no strict gem dependencies outside of `ActiveRecord`. You will have to pick a connection mode, the default is dblib which uses the `TinyTDS` gem. Just bundle the gem and the adapter will use it.
+The adapter has no strict gem dependencies outside of `ActiveRecord` and
+[TinyTDS](https://github.com/rails-sqlserver/tiny_tds).
 
 ```ruby
 gem 'activerecord-sqlserver-adapter'

data/Rakefile

@@ -9,6 +9,8 @@ task test: ["test:dblib"]
 task default: [:test]
 
 namespace :test do
+  ENV["ARCONN"] = "sqlserver"
+
   %w(dblib).each do |mode|
     Rake::TestTask.new(mode) do |t|
       t.libs = ARTest::SQLServer.test_load_paths
@@ -17,14 +19,8 @@ namespace :test do
       t.verbose = false
     end
   end
-
-  task "dblib:env" do
-    ENV["ARCONN"] = "dblib"
-  end
 end
 
-task "test:dblib" => "test:dblib:env"
-
 namespace :profile do
   ["dblib"].each do |mode|
     namespace mode.to_sym do

data/VERSION

@@ -1 +1 @@
-7.0.7
+7.1.0.beta1

data/activerecord-sqlserver-adapter.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 7.0.0"
+  spec.add_dependency "activerecord", "~> 7.1.1"
   spec.add_dependency "tiny_tds"
 end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module AbstractAdapter
+          def sqlserver?
+            false
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AbstractAdapter
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(mod)
+end

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

@@ -8,9 +8,51 @@ module ActiveRecord
     module SQLServer
       module CoreExt
         module Calculations
+          def calculate(operation, column_name)
+            if klass.connection.sqlserver?
+              _calculate(operation, column_name)
+            else
+              super
+            end
+          end
 
           private
 
+          # Same as original `calculate` method except we don't perform PostgreSQL hack that removes ordering.
+          def _calculate(operation, column_name)
+            operation = operation.to_s.downcase
+
+            if @none
+              case operation
+              when "count", "sum"
+                result = group_values.any? ? Hash.new : 0
+                return @async ? Promise::Complete.new(result) : result
+              when "average", "minimum", "maximum"
+                result = group_values.any? ? Hash.new : nil
+                return @async ? Promise::Complete.new(result) : result
+              end
+            end
+
+            if has_include?(column_name)
+              relation = apply_join_dependency
+
+              if operation == "count"
+                unless distinct_value || distinct_select?(column_name || select_for_count)
+                  relation.distinct!
+                  relation.select_values = [ klass.primary_key || table[Arel.star] ]
+                end
+                # PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT
+                # Start of monkey-patch
+                # relation.order_values = [] if group_values.empty?
+                # End of monkey-patch
+              end
+
+              relation.calculate(operation, column_name)
+            else
+              perform_calculation(operation, column_name)
+            end
+          end
+
           def build_count_subquery(relation, column_name, distinct)
             return super unless klass.connection.adapter_name == "SQLServer"
 

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

@@ -8,20 +8,20 @@ module ActiveRecord
           SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
           SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
-          def exec_explain(queries)
+          def exec_explain(queries, options = [])
             return super unless connection.adapter_name == "SQLServer"
 
             unprepared_queries = queries.map do |(sql, binds)|
               [unprepare_sqlserver_statement(sql, binds), binds]
             end
-            super(unprepared_queries)
+            super(unprepared_queries, options)
           end
 
           private
 
-          # This is somewhat hacky, but it should reliably reformat our prepared sql statment
+          # This is somewhat hacky, but it should reliably reformat our prepared sql statement
           # 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.
+          # `sp_executesql` method should substitute the @n args with the quoted values.
           def unprepare_sqlserver_statement(sql, binds)
             return sql unless sql.start_with?(SQLSERVER_STATEMENT_PREFIX)
 

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

@@ -10,18 +10,26 @@ module ActiveRecord
         module FinderMethods
           private
 
-          # Same as original except we order by values in distinct select if present.
           def construct_relation_for_exists(conditions)
-            return super unless klass.connection.adapter_name == "SQLServer"
+            if klass.connection.sqlserver?
+              _construct_relation_for_exists(conditions)
+            else
+              super
+            end
+          end
 
+          # Same as original except we order by values in distinct select if present.
+          def _construct_relation_for_exists(conditions)
             conditions = sanitize_forbidden_attributes(conditions)
 
             if distinct_value && offset_value
+              # Start of monkey-patch
               if select_values.present?
                 relation = order(*select_values).limit!(1)
               else
                 relation = except(:order).limit!(1)
               end
+              # End of monkey-patch
             else
               relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)
             end

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

@@ -8,10 +8,22 @@ module ActiveRecord
       module CoreExt
         module LoaderQuery
           def load_records_for_keys(keys, &block)
-            return super unless scope.connection.adapter_name == "SQLServer"
+            return super unless scope.connection.sqlserver?
 
-            keys.each_slice(in_clause_length).flat_map do |slice|
-              scope.where(association_key_name => slice).load(&block).records
+            if association_key_name.is_a?(Array)
+              query_constraints = Hash.new { |hsh, key| hsh[key] = Set.new }
+
+              keys.each_with_object(query_constraints) do |values_set, constraints|
+                association_key_name.zip(values_set).each do |key_name, value|
+                  constraints[key_name] << value
+                end
+              end
+
+              scope.where(query_constraints).load(&block)
+            else
+              keys.each_slice(in_clause_length).flat_map do |slice|
+                scope.where(association_key_name => slice).load(&block).records
+              end
             end
           end
 

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

@@ -8,45 +8,14 @@ module ActiveRecord
           128
         end
 
-        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
         end
 
-        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
-        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
 
         # The max number of binds is 2100, but because sp_executesql takes