activerecord-sqlserver-adapter 7.2.9 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeac1dd3621ed52e93f365fefbca8a0e83ffcfbdac6b01907260efa98db1069f
-  data.tar.gz: daa368ec2b8e38e25aaab374640a29e7d6a5482a78609b32cabefdc716a01b78
+  metadata.gz: 926f65915d98bb3c271370883fa89891fc575b5c6801cd8c235386c078d34bf5
+  data.tar.gz: 0a932a9d5edf0d3932e3f0ba44328ed77a033a1223f05699e8f4caa79116ac56
 SHA512:
-  metadata.gz: 0ca3530b11fd81b695bde3264fd2daaa221c7f21a7c6e86cbfef14bdf4a60b4aba26238aec58c2456d953fb1aa933c27c0800978061ad71889b0e92fc6a4ebf7
-  data.tar.gz: 5b3b6bbf751511101b26d319554ec1f394fc0d4a76250812146e7400a342b31aa60cb314406f4352f27a49b04fdfa79cf41c7cba12c916b866df6254bf0ddf03
+  metadata.gz: ee45540a8d2ae57dc69a35048f4ccfbf01bcfc91e177e57405b19ccb8a3279eef7b752c22dee20c4171c8bb4e2cb0fcaadb99cd6c25d139fd2ef53577a5cb23a
+  data.tar.gz: 9184a7041e5de445103bcd47832352614897865f0ef49e83067b553786d089be73eb73c34dfaf3f102e02804ee7d8d40803d5582430ebfeecbe95f568b0b7cb7

data/.github/workflows/ci.yml

@@ -1,12 +1,17 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '0 4 * * 1'
 
 jobs:
   test:
     name: Run test suite
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
+    runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
 
     env:
       COMPOSE_FILE: docker-compose.ci.yml
@@ -15,9 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1.6
-          - 3.2.4
-          - 3.3.2
+          - 3.3.4
+          - 3.2.5
 
     steps:
       - name: Checkout code

data/CHANGELOG.md

@@ -1,74 +1,12 @@
-## v7.2.9
-
-#### Fixed
-
-- [#1371](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1371) Fixed query logging so that filter parameters are respected.
-
-## v7.2.8
-
-#### Fixed
-
-- [#1365](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1365) Verify connection before retrieving the database version.
-
-## v7.2.7
+## v8.0.0
 
 #### Changed
 
-- [#1341](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1341) Support more Azure services by changing language source.
-
-#### Fixed
-
-- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.
-
-## v7.2.6
-
-#### Fixed
-
-- [#1333](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1333) Enable identity insert on view's base table for fixtures.
-
-## v7.2.5
-
-#### Fixed
-
-- [#1308](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1308) Fix retrieval of temporary table's column information.
-
-## v7.2.4
+- [#1216](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1216) Refactor adapter interface to match abstract adapter
+- [#1225](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1225) Drop support to Ruby 3.1
 
 #### Fixed
 
-- [#1270](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1270) Fix parsing of raw table name from SQL with extra parentheses
-
-## v7.2.3
-
-#### Fixed
-
-- [#1262](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1262) Fix distinct alias when multiple databases used.
-
-## v7.2.2
-
-#### Fixed
-
-- [#1244](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1244) Allow INSERT statements with SELECT notation
-- [#1247](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1247) Fix queries with date and date-time placeholder conditions
-- [#1249](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1249) Binary basic columns should be limitable
-- [#1255](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1255) Fixed the ordering of optimizer hints in the generated SQL
-
-## v7.2.1
-
-#### Fixed
-
-- [#1231](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1231) Enable identity insert on view's base table
-
-## v7.2.0
-
-#### Added
-
-- [#1178](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1178) Support encrypting binary columns
-
-#### Changed
-
-- [#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
-
+- [#1215](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1215) Fix mismatched foreign key errors
 
-Please check [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-1-stable/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-2-stable/CHANGELOG.md) for previous changes.

data/Dockerfile.ci

@@ -9,6 +9,6 @@ WORKDIR $WORKDIR
 
 COPY . $WORKDIR
 
-RUN RAILS_BRANCH=7-2-stable bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
+RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
 
 CMD ["sh"]

data/Gemfile

@@ -18,6 +18,8 @@ if ENV["RAILS_SOURCE"]
   gemspec path: ENV["RAILS_SOURCE"]
 elsif ENV["RAILS_BRANCH"]
   gem "rails", github: "rails/rails", branch: ENV["RAILS_BRANCH"]
+elsif ENV["RAILS_COMMIT"]
+  gem "rails", github: "rails/rails", ref: ENV["RAILS_COMMIT"]
 else
   # Need to get rails source because the gem doesn't include tests
   version = ENV["RAILS_VERSION"] || begin

data/README.md

@@ -1,4 +1,4 @@
-# ActiveRecord SQL Server Adapter. For SQL Server 2012 And Higher.
+# ActiveRecord SQL Server Adapter
 
 * [![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
 * [![Gem Version](http://img.shields.io/gem/v/activerecord-sqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-sqlserver-adapter) - Gem Version
@@ -8,15 +8,18 @@
 
 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. For older versions, please check
-their stable branches.
+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. We also have stable branches for each major/minor release of ActiveRecord.
+
+We support the versions of the adapter that are in the Rails [Bug Fixes](https://rubyonrails.org/maintenance)
+maintenance group.
+
+See [Rubygems](https://rubygems.org/gems/activerecord-sqlserver-adapter/versions) for the latest version of the adapter for each Rails release.
 
 | Adapter Version | Rails Version | Support        | Branch                                                                                          |
 |-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
-| `7.2.x`        | `7.2.x`       | Active | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
+| `8.0.0`         | `8.0.x`       | Active | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
+| `7.2.x`         | `7.2.x`       | Active         | [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-2-stable) |
 | `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`       | Ended         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
 | `6.1.x`         | `6.1.x`       | Ended         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
@@ -26,7 +29,6 @@ their stable branches.
 | `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
 
@@ -103,16 +105,14 @@ configuration then implement the `configure_connection` method in an initializer
 example we are setting the `TEXTSIZE` to 64 megabytes.
 
 ```ruby
-module ActiveRecord
-  module ConnectionAdapters
-    class SQLServerAdapter < AbstractAdapter
-      def configure_connection
-        super
-        @raw_connection.execute("SET TEXTSIZE #{64.megabytes}").do
-      end
+ActiveRecord::ConnectionAdapters::SQLServerAdapter.prepend(
+  Module.new do
+    def configure_connection
+      super
+      @raw_connection.execute("SET TEXTSIZE #{64.megabytes}").do
     end
   end
-end
+)
 ```
 
 #### Configure Application Name
@@ -262,7 +262,6 @@ Many many people have contributed. If you do not see your name here and it shoul
 
 You can see an up-to-date list of contributors here: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
 
-
 ## License
 
 ActiveRecord SQL Server Adapter is released under the [MIT License](https://opensource.org/licenses/MIT).

data/VERSION

@@ -1 +1 @@
-7.2.9
+8.0.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 = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.2.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.2.0"
+  spec.add_dependency "activerecord", "~> 8.0.0"
   spec.add_dependency "tiny_tds"
 end

data/docker-compose.ci.yml

@@ -5,7 +5,6 @@ services:
   ci:
     environment:
       - ACTIVERECORD_UNITTEST_HOST=sqlserver
-      - RAILS_BRANCH=7-2-stable
     build:
       context: .
       dockerfile: Dockerfile.ci

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

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

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

@@ -13,48 +13,42 @@ module ActiveRecord
           !READ_QUERY.match?(sql.b)
         end
 
-        def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
-          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) }
-                       else
-                         internal_raw_execute(sql, conn, perform_do: true)
-                       end
-              verified!
-              notification_payload[:row_count] = result
-              result
-            end
+        def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch:)
+          result = if id_insert_table_name = query_requires_identity_insert?(sql)
+                     # If the table name is a view, we need to get the base table name for enabling identity insert.
+                     id_insert_table_name = view_table_name(id_insert_table_name) if view_exists?(id_insert_table_name)
+
+                     with_identity_insert_enabled(id_insert_table_name, raw_connection) do
+                       internal_exec_sql_query(sql, raw_connection)
+                     end
+                   else
+                     internal_exec_sql_query(sql, raw_connection)
+                   end
+
+          verified!
+          notification_payload[:row_count] = result.count
+          result
+        end
+
+        def cast_result(raw_result)
+          if raw_result.columns.empty?
+            ActiveRecord::Result.empty
+          else
+            ActiveRecord::Result.new(raw_result.columns, raw_result.rows)
           end
         end
 
-        def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false)
-          sql = transform_query(sql)
-
-          check_if_write_query(sql)
-          mark_transaction_written_if_write(sql)
-
-          type_casted_binds = type_casted_binds(binds)
-          log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
-            unless without_prepared_statement?(binds)
-              types, params = sp_executesql_types_and_parameters(binds)
-              sql = sp_executesql_sql(sql, types, params, name)
-            end
-
-            with_raw_connection do |conn|
-              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
+        def affected_rows(raw_result)
+          raw_result.first['AffectedRows']
+        end
 
-              verified!
-              notification_payload[:row_count] = result.count
-              result
-            end
+        def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
+          unless binds.nil? || binds.empty?
+            types, params = sp_executesql_types_and_parameters(binds)
+            sql = sp_executesql_sql(sql, types, params, name)
           end
+
+          super
         end
 
         def internal_exec_sql_query(sql, conn)
@@ -64,14 +58,14 @@ module ActiveRecord
           finish_statement_handle(handle)
         end
 
-        def exec_delete(sql, name, binds)
+        def exec_delete(sql, name = nil, binds = [])
           sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
-          super(sql, name, binds).rows.first.first
+          super(sql, name, binds)
         end
 
-        def exec_update(sql, name, binds)
+        def exec_update(sql, name = nil, binds = [])
           sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
-          super(sql, name, binds).rows.first.first
+          super(sql, name, binds)
         end
 
         def begin_db_transaction
@@ -154,7 +148,7 @@ module ActiveRecord
             returning_sql = if returning.is_a?(String)
                               returning
                             else
-                              returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
+                              Array(returning).map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
                             end
             sql << " OUTPUT #{returning_sql}"
           end
@@ -192,14 +186,11 @@ module ActiveRecord
         end
 
         def with_identity_insert_enabled(table_name, conn)
-          # If the table name is a view, we need to get the base table name for enabling identity insert.
-          table_name = view_table_name(table_name) if view_exists?(table_name)
-          quoted_table_name = quote_table_name(table_name)
-
-          set_identity_insert(quoted_table_name, conn, true)
+          table_name = quote_table_name(table_name)
+          set_identity_insert(table_name, conn, true)
           yield
         ensure
-          set_identity_insert(quoted_table_name, conn, false)
+          set_identity_insert(table_name, conn, false)
         end
 
         def use_database(database = nil)
@@ -229,7 +220,7 @@ module ActiveRecord
 
         def user_options_dateformat
           if sqlserver_azure?
-            select_value "SELECT [dateformat] FROM [sys].[syslanguages] WHERE [name] = @@LANGUAGE", "SCHEMA"
+            select_value "SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID", "SCHEMA"
           else
             user_options["dateformat"]
           end
@@ -333,10 +324,13 @@ module ActiveRecord
 
         def sp_executesql_sql_type(attr)
           if attr.respond_to?(:type)
-            return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
+            type = attr.type.is_a?(ActiveRecord::Normalization::NormalizedValueType) ? attr.type.cast_type : attr.type
+            type = type.subtype if type.serialized?
+
+            return type.sqlserver_type if type.respond_to?(:sqlserver_type)
 
-            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
+            if type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType) && type.instance_variable_get(:@cast_type).respond_to?(:sqlserver_type)
+              return type.instance_variable_get(:@cast_type).sqlserver_type
             end
           end
 
@@ -376,6 +370,7 @@ module ActiveRecord
             sql = "EXEC sp_executesql #{quote(sql)}"
             sql += ", #{types}, #{params}" unless params.empty?
           end
+
           sql.freeze
         end
 
@@ -453,10 +448,9 @@ module ActiveRecord
         # TinyTDS returns false instead of raising an exception if connection fails.
         # Getting around this by raising an exception ourselves while PR
         # https://github.com/rails-sqlserver/tiny_tds/pull/469 is not released.
-        def internal_raw_execute(sql, conn, perform_do: false)
-          result = conn.execute(sql).tap do |_result|
-            raise TinyTds::Error, "failed to execute statement" if _result.is_a?(FalseClass)
-          end
+        def internal_raw_execute(sql, raw_connection, perform_do: false)
+          result = raw_connection.execute(sql)
+          raise TinyTds::Error, "failed to execute statement" if result.is_a?(FalseClass)
 
           perform_do ? result.do : result
         end