activerecord-sqlserver-adapter 7.1.7 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb26ce0a56d756f8e9ba1d571ab3f3b6ce092ac3c86f8b37bce56942ec96c485
-  data.tar.gz: efa5adca77b15a3c5b25c216b1b63d311a1fbfbc5ab79186d94f1b4f9a6ecedb
+  metadata.gz: b6356803690516019929168fed2c356f3250eb5ec8a9894b8117fc35db84b8c1
+  data.tar.gz: dbedbedb583e766c526d959459166edd195516700fb6f0b1be2769ea1d947233
 SHA512:
-  metadata.gz: 6bfc66070966a026f6f1b42bf1c87e48ad9e0d044ce01755eeddbcbc71f2b5cabd8cd395dc9ebfa0aa1e92c5b8f4c524ead92d1abf017b907de774f224c0c02a
-  data.tar.gz: 9ebcf4c64077e0fdfac80b7f5ca6fc5b6218251f378dd6f61c3fcbfd48e4196a93fc09a5de87048834f1e96f3b839ddd2e0ec61457da081bf3f20fd5d5fed08c
+  metadata.gz: 5079fd8e88a8e67b91f11de2f9ec158d686afe121461f2b2050ebdd1072f1ac0fc86356dd81da507e99b72b8f9266aa5a59031d886dcb8d119715cab4cbef1c8
+  data.tar.gz: d1a8f37563ba09c443242e83f75098b2cc74bd269c9b11b9c6834a5e2fa23c7791f93083c7884ec1d22acdeca3bdf75f752153bde565fa0d92c3988a6653565c

data/.devcontainer/Dockerfile

@@ -6,9 +6,9 @@ FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
 
 # TinyTDS
 RUN apt-get -y install libc6-dev \
-    && wget http://www.freetds.org/files/stable/freetds-1.1.32.tar.gz \
-    && tar -xzf freetds-1.1.32.tar.gz \
-    && cd freetds-1.1.32 \
+    && wget http://www.freetds.org/files/stable/freetds-1.4.14.tar.gz \
+    && tar -xzf freetds-1.4.14.tar.gz \
+    && cd freetds-1.4.14 \
     && ./configure --prefix=/usr/local --with-tdsver=7.3 \
     && make \
     && make install

data/.github/workflows/ci.yml

@@ -1,6 +1,12 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '0 18 * * *'
 
 jobs:
   test:
@@ -14,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0.6
-          - 3.1.4
-          - 3.2.2
+          - 3.1.6
+          - 3.2.4
+          - 3.3.2
 
     steps:
       - name: Checkout code

data/CHANGELOG.md

@@ -1,106 +1,12 @@
-## v7.1.7
-
-#### Fixed
-
-- [#1210](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1210) Handle blank SQL when parsing table name
-
-## v7.1.6
-
-#### Fixed
-
-- [#1208](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1208) Exclude "guest" schema in schema dumper
-
-## v7.1.5
+## Unreleased
 
 #### Added
 
-- [#1201](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1201) Support non-dbo schemas in schema dumper
-- [#1206](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1206) Support table names containing spaces
-
-## v7.1.4
-
-#### Fixed
-
-- [#1164](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1164) Fix composite primary key with different data type with triggers
+- [#1178](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1178) Support encrypting binary columns
 
 #### Changed
 
-- [#1199](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1199) Remove ActiveRecord::Relation#calculate patch
-
-## v7.1.3
-
-#### Fixed
-
-- [#1152](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1152) Fix Composite Key Inserts with Triggers
-
-## v7.1.2
-
-#### Fixed
-
-- [#1151](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1151) FROM subquery should work if order provided
-
-## v7.1.1
-
-#### Fixed
-
-- [#1145](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1145) Ensure correct order of COLLATE and NOT NULL in CREATE TABLE statements
-- [#1144](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1144) Fix precision handling in time migration
-- [#1143](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1143) Fix precision handling for datetimeoffset migration
-
-## v7.1.0
-
-#### Added
-
-- [#1141](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1141) Added support for check constraints.
-
-## v7.1.0.rc2
-
-#### Added
-
-- [#1136](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1136) Prevent marking broken connections as verified
-- [#1138](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1138) Cache quoted names
-
-## v7.1.0.rc1
-
-#### Added
-
-* Rails 7.1 Support
-
-  The adapter supports new Rails 7.1 features such as composite primary keys. See the
-  [Rails 7.1 release notes](https://guides.rubyonrails.org/7_1_release_notes.html) for more information.
-
-#### Changed
-
-* Configure Connection
-
-  If you require additional connection configuration you now need to call `super` within the `configure_connection`
-  method so that the default configuration is also applied.
-
-  v7.1.x adapter:
-  ```ruby
-  module ActiveRecord
-    module ConnectionAdapters
-      class SQLServerAdapter < AbstractAdapter
-        def configure_connection
-          super
-          raw_connection_do "SET TEXTSIZE #{64.megabytes}"
-        end
-      end
-    end
-  end
-  ```
-
-  v7.0.x adapter:
-  ```ruby
-  module ActiveRecord
-    module ConnectionAdapters
-      class SQLServerAdapter < AbstractAdapter
-        def configure_connection
-          raw_connection_do "SET TEXTSIZE #{64.megabytes}"
-        end
-      end
-    end
-  end
-  ```
+- [#1153](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1153) Only support Ruby v3.1+
+- [#1196](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1196) Use default inspect for database adapter
 
-Please check [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-0-stable/CHANGELOG.md) for previous changes.
+Please check [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-1-stable/CHANGELOG.md) for previous changes.

data/Gemfile

@@ -8,16 +8,16 @@ gemspec
 
 gem "bcrypt"
 gem "pg",      ">= 0.18.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", ">= 1.6.6"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "benchmark-ips"
-gem "minitest", ">= 5.15.0", "< 5.16"
+gem "minitest", ">= 5.15.0"
 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'
+elsif ENV["RAILS_BRANCH"]
+  gem "rails", github: "rails/rails", branch: ENV["RAILS_BRANCH"]
 else
   # Need to get rails source because the gem doesn't include tests
   version = ENV["RAILS_VERSION"] || begin

data/README.md

@@ -1,7 +1,6 @@
 # ActiveRecord SQL Server Adapter. For SQL Server 2012 And Higher.
 
 * [![CI](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/actions/workflows/ci.yml/badge.svg)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/actions/workflows/ci.yml) - CI
-* [![Build Status](https://ci.appveyor.com/api/projects/status/mtgbx8f57vr7k2qa/branch/master?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/activerecord-sqlserver-adapter/branch/master) - Appveyor
 * [![Gem Version](http://img.shields.io/gem/v/activerecord-sqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-sqlserver-adapter) - Gem Version
 * [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter) - Community
 
@@ -9,21 +8,25 @@
 
 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 | Branch                                                                                           |
-|-----------------|---------------|---------|--------------------------------------------------------------------------------------------------|
-| Unreleased      | `7.2.x`       | In Development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
-| `7.1.7`         | `7.1.x`       | Active         | [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-1-stable) |
-| `7.0.7`         | `7.0.x`       | Active  | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable)  |
-| `6.1.3.0`       | `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`       | Ended   | [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.
+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. For older versions, please check
+their stable branches.
+
+| Adapter Version | Rails Version | Support        | Branch                                                                                          |
+|-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
+| `7.2.x`        | `7.2.x`       | Active | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
+| `7.1.x`         | `7.1.x`       | Active         | [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-1-stable) |
+| `7.0.x`         | `7.0.x`       | Active         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
+| `6.1.x`         | `6.1.x`       | Active         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
+| `6.0.x`         | `6.0.x`       | Ended          | [6-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
+| `5.2.x`         | `5.2.x`       | Ended          | [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |
+| `5.1.x`         | `5.1.x`       | Ended          | [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable) |
+| `4.2.x`         | `4.2.x`       | Ended          | [4-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable) |
+| `4.1.x`         | `4.1.x`       | Ended          | [4-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-1-stable) |
+
+See [Rubygems](https://rubygems.org/gems/activerecord-sqlserver-adapter/versions) for the latest version of the adapter for each Rails release.
 
 #### Native Data Type Support
 
@@ -168,14 +171,35 @@ ActiveRecord::ConnectionAdapters::SQLServerAdapter.showplan_option = 'SHOWPLAN_X
 
 ## New Rails Applications
 
-When creating a new Rails application you can specify that you want to use the SQL Server adapter using the `database` option:
+When creating a new Rails application you need to perform the following steps to connect a Rails application to a
+SQL Server instance.
 
+1. Create new Rails application, the database defaults to `sqlite`.
+
+```bash
+rails new my_app
 ```
-rails new my_app --database=sqlserver
+
+2. Update the Gemfile to install the adapter instead of the SQLite adapter. Remove the `sqlite3` gem from the Gemfile.
+
+```ruby
+gem 'activerecord-sqlserver-adapter'
 ```
 
-To then connect the application to your SQL Server instance edit the `config/database.yml` file with the username, password and host of your SQL Server instance.
+3. Connect the application to your SQL Server instance by editing the `config/database.yml` file with the username,
+password and host of your SQL Server instance.
+
+Example:
 
+```yaml
+development:
+  adapter: sqlserver
+  host: 'localhost'
+  port: 1433
+  database: my_app_development
+  username: 'frank_castle'
+  password: 'secret'
+```
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-7.1.7
+7.2.0

data/activerecord-sqlserver-adapter.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.version       = version
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.license       = "MIT"
   spec.authors       = ["Ken Collins", "Anna Carey", "Will Bond", "Murray Steele", "Shawn Balestracci", "Joe Rafaniello", "Tom Ward", "Aidan Haran"]
@@ -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.1.1"
+  spec.add_dependency "activerecord", "~> 7.2.0"
   spec.add_dependency "tiny_tds"
 end

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

@@ -10,11 +10,13 @@ module ActiveRecord
           private
 
           def attributes_for_update(attribute_names)
-            return super unless self.class.connection.adapter_name == "SQLServer"
+            self.class.with_connection do |connection|
+              return super(attribute_names) unless connection.sqlserver?
 
-            super.reject do |name|
-              column = self.class.columns_hash[name]
-              column && column.respond_to?(:is_identity?) && column.is_identity?
+              super(attribute_names).reject do |name|
+                column = self.class.columns_hash[name]
+                column && column.respond_to?(:is_identity?) && column.is_identity?
+              end
             end
           end
         end

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

@@ -8,13 +8,14 @@ module ActiveRecord
     module SQLServer
       module CoreExt
         module Calculations
-          
-          private
 
+          private
+          
           def build_count_subquery(relation, column_name, distinct)
-            return super unless klass.connection.adapter_name == "SQLServer"
-
-            super(relation.unscope(:order), column_name, distinct)
+            klass.with_connection do |connection|
+              relation = relation.unscope(:order) if connection.sqlserver?
+              super(relation, column_name, distinct)
+            end
           end
         end
       end

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

@@ -9,12 +9,15 @@ module ActiveRecord
           SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries, options = [])
-            return super unless connection.adapter_name == "SQLServer"
+            with_connection do |connection|
+              return super(queries, options) unless connection.sqlserver?
 
-            unprepared_queries = queries.map do |(sql, binds)|
-              [unprepare_sqlserver_statement(sql, binds), binds]
+              unprepared_queries = queries.map do |(sql, binds)|
+                [unprepare_sqlserver_statement(sql, binds), binds]
+              end
+
+              super(unprepared_queries, options)
             end
-            super(unprepared_queries, options)
           end
 
           private

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

@@ -11,10 +11,12 @@ module ActiveRecord
           private
 
           def construct_relation_for_exists(conditions)
-            if klass.connection.sqlserver?
-              _construct_relation_for_exists(conditions)
-            else
-              super
+            klass.with_connection do |connection|
+              if connection.sqlserver?
+                _construct_relation_for_exists(conditions)
+              else
+                super
+              end
             end
           end
 

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

@@ -8,23 +8,25 @@ module ActiveRecord
       module CoreExt
         module LoaderQuery
           def load_records_for_keys(keys, &block)
-            return super unless scope.connection.sqlserver?
+            scope.with_connection do |connection|
+              return super unless connection.sqlserver?
 
-            return [] if keys.empty?
+              return [] if keys.empty?
 
-            if association_key_name.is_a?(Array)
-              query_constraints = Hash.new { |hsh, key| hsh[key] = Set.new }
+              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
+                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
-              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
+                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
           end

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

@@ -14,9 +14,7 @@ module ActiveRecord
         end
 
         def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
-          result = nil
-
-          log(sql, name, async: async) do
+          log(sql, name, async: async) do |notification_payload|
             with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
               result = if id_insert_table_name = query_requires_identity_insert?(sql)
                          with_identity_insert_enabled(id_insert_table_name, conn) { internal_raw_execute(sql, conn, perform_do: true) }
@@ -24,14 +22,13 @@ module ActiveRecord
                          internal_raw_execute(sql, conn, perform_do: true)
                        end
               verified!
+              notification_payload[:row_count] = result
+              result
             end
           end
-
-          result
         end
 
-        def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false)
-          result = nil
+        def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false)
           sql = transform_query(sql)
 
           check_if_write_query(sql)
@@ -42,20 +39,21 @@ module ActiveRecord
             sql = sp_executesql_sql(sql, types, params, name)
           end
 
-          log(sql, name, binds, async: async) do
+          log(sql, name, binds, async: async) do |notification_payload|
             with_raw_connection do |conn|
-              if id_insert_table_name = query_requires_identity_insert?(sql)
-                with_identity_insert_enabled(id_insert_table_name, conn) do
-                  result = internal_exec_sql_query(sql, conn)
-                end
-              else
-                result = internal_exec_sql_query(sql, conn)
-              end
+              result = if id_insert_table_name = query_requires_identity_insert?(sql)
+                         with_identity_insert_enabled(id_insert_table_name, conn) do
+                           internal_exec_sql_query(sql, conn)
+                         end
+                       else
+                         internal_exec_sql_query(sql, conn)
+                       end
+
               verified!
+              notification_payload[:row_count] = result.count
+              result
             end
           end
-
-          result
         end
 
         def internal_exec_sql_query(sql, conn)
@@ -153,10 +151,10 @@ module ActiveRecord
 
           if returning = insert.send(:insert_all).returning
             returning_sql = if returning.is_a?(String)
-              returning
-            else
-              returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
-            end
+                              returning
+                            else
+                              returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
+                            end
             sql << " OUTPUT #{returning_sql}"
           end
 
@@ -174,7 +172,7 @@ module ActiveRecord
                  end.join(", ")
           sql = "EXEC #{proc_name} #{vars}".strip
 
-          log(sql, "Execute Procedure") do
+          log(sql, "Execute Procedure") do |notification_payload|
             with_raw_connection do |conn|
               result = internal_raw_execute(sql, conn)
               verified!
@@ -185,10 +183,11 @@ module ActiveRecord
                 yield(r) if block_given?
               end
 
-              result.each.map { |row| row.is_a?(Hash) ? row.with_indifferent_access : row }
+              result = result.each.map { |row| row.is_a?(Hash) ? row.with_indifferent_access : row }
+              notification_payload[:row_count] = result.count
+              result
             end
           end
-
         end
 
         def with_identity_insert_enabled(table_name, conn)
@@ -329,11 +328,17 @@ module ActiveRecord
         end
 
         def sp_executesql_sql_type(attr)
-          return "nvarchar(max)".freeze if attr.is_a?(Symbol)
-          return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
+          if attr.respond_to?(:type)
+            return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
 
-          case value = attr.value_for_database
-          when Numeric
+            if attr.type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType) && attr.type.instance_variable_get(:@cast_type).respond_to?(:sqlserver_type)
+              return attr.type.instance_variable_get(:@cast_type).sqlserver_type
+            end
+          end
+
+          value = basic_attribute_type?(attr) ? attr : attr.value_for_database
+
+          if value.is_a?(Numeric)
             value > 2_147_483_647 ? "bigint".freeze : "int".freeze
           else
             "nvarchar(max)".freeze
@@ -341,17 +346,26 @@ module ActiveRecord
         end
 
         def sp_executesql_sql_param(attr)
-          return quote(attr) if attr.is_a?(Symbol)
+          return quote(attr) if basic_attribute_type?(attr)
 
           case value = attr.value_for_database
-          when Type::Binary::Data,
-               ActiveRecord::Type::SQLServer::Data
+          when Type::Binary::Data, ActiveRecord::Type::SQLServer::Data
             quote(value)
           else
             quote(type_cast(value))
           end
         end
 
+        def basic_attribute_type?(type)
+          type.is_a?(Symbol) ||
+            type.is_a?(String) ||
+            type.is_a?(Numeric) ||
+            type.is_a?(Time) ||
+            type.is_a?(TrueClass) ||
+            type.is_a?(FalseClass) ||
+            type.is_a?(NilClass)
+        end
+
         def sp_executesql_sql(sql, types, params, name)
           if name == "EXPLAIN"
             params.each.with_index do |param, index|
@@ -424,7 +438,11 @@ module ActiveRecord
             qo[:as] = (options[:ar_result] || options[:fetch] == :rows) ? :array : :hash
           end
           results = handle.each(query_options)
-          columns = lowercase_schema_reflection ? handle.fields.map { |c| c.downcase } : handle.fields
+
+          columns = handle.fields
+          # If query returns multiple result sets, only return the columns of the last one.
+          columns = columns.last if columns.any? && columns.all? { |e| e.is_a?(Array) }
+          columns = columns.map(&:downcase) if lowercase_schema_reflection
 
           options[:ar_result] ? ActiveRecord::Result.new(columns, results) : results
         end