activerecord-sqlserver-adapter 8.0.10 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c3e4f4ea64ada810516060935068217cc32d43b160f33fec283e6a81889168
-  data.tar.gz: efa5b8818e45ca35a610a850ed44253f4682f83267a46822b23604fd78655e94
+  metadata.gz: faf6670e4b55968e4dcfcb37340d733dc8db5a21fbd3b43b5f717183a6240dd8
+  data.tar.gz: d3eab140bf29dcdc1907415414e93e74eeb3d561758fc53f8457af83f5b8ec7d
 SHA512:
-  metadata.gz: 9e8f1d1a400b6a624d22ae77f6b8d70a31e967790cdd30be86d476f94af7e45ea913d5278a02fddebcd4ee30749c0277c4624e61b6f4ec521403a966f5dc2f96
-  data.tar.gz: 78ff679e5aea744e81da238916812c364b7fef69e6b7e4cc2bbb4a59f96d256cd62f70ca886504fe815723aa12d2e91efef88793c92cbe6c494f58dc78f3c041
+  metadata.gz: f2659c6511ccf88935c1992f6a485bde6e75e4a4010222f3cbcaf2f4c90353eda7c4fff92fcc599d04cd8df1bffa6830e1691a7660d4f3e2c21dd058a3eda456
+  data.tar.gz: 5c28518313d0718e690b82be108c97a2f237a1cf4445c117a25c8d8b8ed6d0b05a5d09b46164fc5734b407728ed18878f39fe2a75b6ff0f47918e775a306eef2

data/.devcontainer/Dockerfile

@@ -25,6 +25,6 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/t
 RUN mkdir -p /tmp/activerecord-sqlserver-adapter
 COPY Gemfile VERSION activerecord-sqlserver-adapter.gemspec /tmp/activerecord-sqlserver-adapter/
 RUN cd /tmp/activerecord-sqlserver-adapter \
-    && bundle install \
+    && RAILS_BRANCH=8-1-stable bundle install \
     && rm -rf /tmp/activerecord-sqlserver-adapter
 RUN chown -R vscode:vscode /usr/local/rvm

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 4 * * 0'
 
 jobs:
   test:
@@ -15,8 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.3.6
-          - 3.2.6
+          - 3.4.7
+          - 3.3.9
+          - 3.2.9
 
     steps:
       - name: Checkout code
@@ -27,3 +34,27 @@ jobs:
 
       - name: Run tests
         run: docker compose run ci
+
+
+  standardrb:
+    name: Code linting and formatting
+    runs-on: ubuntu-latest
+
+    env:
+      COMPOSE_FILE: compose.ci.yaml
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 3.4.1
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build docker images
+        run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }}
+
+      - name: Run standardrb
+        run: docker compose run standardrb

data/CHANGELOG.md

@@ -1,78 +1,24 @@
-## v8.0.10
-
-#### Fixed
-
-- [#1370](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1370) Fixed query logging so that filter parameters are respected.
-
-## v8.0.9
-
-#### Fixed
-
-- [#1366](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1366) Correctly retrieve the SQL Server database version.
-
-## v8.0.8
-
-#### Changed
-
-- [#1342](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1342) Support more Azure services by changing language source.
-
-#### Fixed
-- [#1345](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1345) Maintain index options during `change_column` operations.
-- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.
-
-## v8.0.7
-
-#### Fixed
-
-- [#1334](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1334) Enable identity insert on view's base table for fixtures.
-- [#1339](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1339) Fix `insert_all`/`upsert_all` for table names containing numbers.
-
-## v8.0.6
-
-#### Fixed
-
-- [#1318](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1318) Reverse order of values when upserting
-- [#1321](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1321) Fix SQL statement to calculate `updated_at` when upserting
-
-## v8.0.5
+## v8.1.0
 
 #### Added
 
-- [#1315](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1315) Add support for `insert_all` and `upsert_all`
-
-## v8.0.4
-
-#### Fixed
-
-- [#1308](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1308) Fix retrieval of temporary table's column information.
-
-## v8.0.3
-
-#### Fixed
-
-- [#1306](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1306) Fix affected rows count when lowercase schema reflection enabled
-
-## v8.0.2
-
-#### Fixed
-
-- [#1272](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1272) Fix parsing of raw table name from SQL with extra parentheses
-
-## v8.0.1
-
-#### Fixed
-
-- [#1262](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1262) Fix distinct alias when multiple databases used.
-
-## v8.0.0
+- [#1301](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1301) Add support for `INDEX INCLUDE`.
+- [#1312](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1312) Add support for `insert_all` and `upsert_all`.
+- [#1367](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1367) Added support for computed columns.
 
 #### Changed
 
-- [#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.
+- [#1273](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1273) TinyTDS v3+ is now required.
+- [#1317](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1317) Reverse order of values when upserting.
+- [#1343](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1343) Support more Azure services by changing language source.
 
 #### Fixed
 
-- [#1215](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1215) Fix mismatched foreign key errors.
+- [#1313](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1313) Correctly retrieve the SQL Server database version.
+- [#1320](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1320) Fix SQL statement to calculate `updated_at` when upserting.
+- [#1327](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1327) Fix multiple `nil` identity columns for merge insert.
+- [#1338](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1338) Fix `insert_all`/`upsert_all` for table names containing numbers.
+- [#1345](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1345) Maintain index options during `change_column` operations.
+- [#1357](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1357) Support cross database inserts.
 
-Please check [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-2-stable/CHANGELOG.md) for previous changes.
+Please check [8-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/8-0-stable/CHANGELOG.md) for previous changes.

data/Dockerfile.ci

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

data/Gemfile

@@ -7,8 +7,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 gem "bcrypt"
-gem "pg",      ">= 0.18.0"
-gem "sqlite3", ">= 1.6.6"
+gem "pg", "1.5.9"
+gem "sqlite3", ">= 2.1"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "benchmark-ips"
 gem "minitest", ">= 5.15.0"
@@ -27,14 +27,14 @@ else
     require "net/http"
     require "yaml"
 
-    spec = eval(File.read("activerecord-sqlserver-adapter.gemspec"))
-    ver  = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
+    spec = Gem::Specification.load("activerecord-sqlserver-adapter.gemspec")
+    ver = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
     major, minor, _tiny, pre = ver.split(".")
 
     if pre
       ver
     else
-      uri  = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
+      uri = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -68,9 +68,7 @@ end
 group :guard do
   gem "guard"
   gem "guard-minitest"
-  gem "terminal-notifier-guard" if RbConfig::CONFIG["host_os"] =~ /darwin/
+  gem "terminal-notifier-guard" if /darwin/.match?(RbConfig::CONFIG["host_os"])
 end
 
-group :rubocop do
-  gem "rubocop", require: false
-end
+gem "standard", require: false

data/Guardfile

@@ -6,7 +6,7 @@ clearing :on
 notification :terminal_notifier if defined?(TerminalNotifier)
 ignore %r{debug\.log}
 
-ar_lib  = File.join ARTest::SQLServer.root_activerecord, "lib"
+ar_lib = File.join ARTest::SQLServer.root_activerecord, "lib"
 ar_test = File.join ARTest::SQLServer.root_activerecord, "test"
 
 guard :minitest, {
@@ -24,7 +24,7 @@ guard :minitest, {
   else
     watch(%r{^test/cases/\w+_test_sqlserver\.rb$})
     watch(%r{^test/cases/coerced_tests\.rb$}) { "test/cases/coerced_tests.rb" }
-    watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$})  { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
+    watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$}) { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
     watch(%r{^test/cases/helper_sqlserver\.rb$}) { "test" }
   end
 end

data/README.md

@@ -16,23 +16,24 @@ 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                                                                                          |
-|-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
-| `8.0.x`         | `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) |
-| `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) |
+| Adapter Version | Rails Version | Support        | Branch                                                                                             |
+|-----------------|---------------|----------------|----------------------------------------------------------------------------------------------------|
+| Unreleased      | `8.1.x`       | In Development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)                |
+| `8.0.x`         | `8.0.x`       | Active         | [8-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/8-0-stable) |
+| `7.2.x`         | `7.2.x`       | Ended         | [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-2-stable)    |
+| `7.1.x`         | `7.1.x`       | Ended          | [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)    |
+| `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)    |
 
 
 #### Native Data Type Support
 
-We support every data type supported by FreeTDS. All simplified Rails types in migrations will correspond to a matching SQL Server national (unicode) data type. Always check the `initialize_native_database_types` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver/schema_statements.rb) for an updated list.
+We support every data type supported by FreeTDS. All simplified Rails types in migrations will correspond to a matching SQL Server national (unicode) data type. Always check the `NATIVE_DATABASE_TYPES` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver_adapter.rb) for an updated list.
 
 The following types (`date`, `datetime2`, `datetimeoffset`, `time`) all require TDS version `7.3` with TinyTDS. We recommend using FreeTDS 1.0 or higher which default to using `TDSVER` to `7.3`. The adapter also sets TinyTDS's `tds_version` to this as well if non is specified.
 
@@ -185,6 +186,19 @@ The removal of duplicates happens during the SQL query.
 
 Because of this implementation, if you pass `on_duplicate` to `upsert_all`, make sure to assign your value to `target.[column_name]` (e.g. `target.status = GREATEST(target.status, 1)`). To access the values that you want to upsert, use `source.[column_name]`.
 
+#### Computed Columns
+
+The adapter supports computed columns. They can either be virtual `stored: false` (default) and persisted `stored: true`. You can create a computed column in a migration like so:
+
+```ruby
+create_table :users do |t|
+  t.string :name
+  t.virtual :lower_name, as: "LOWER(name)", stored: false
+  t.virtual :upper_name, as: "UPPER(name)", stored: true
+  t.virtual :name_length, as: "LEN(name)"
+end
+```
+
 ## New Rails Applications
 
 When creating a new Rails application you need to perform the following steps to connect a Rails application to a
@@ -226,6 +240,12 @@ The adapter has no strict gem dependencies outside of `ActiveRecord` and
 gem 'activerecord-sqlserver-adapter'
 ```
 
+## Reporting an Issue
+
+Having a way to reproduce your issue will help people confirm, investigate, and ultimately fix your issue. You
+can do this by providing an executable test case. To make this process easier, we have prepared a bug report template
+for you to use as a starting point at [How to report a bug](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/wiki/How-to-report-a-bug).
+
 ## Contributing
 
 Please contribute to the project by submitting bug fixes and features. To make sure your fix/feature has

data/Rakefile

@@ -11,7 +11,7 @@ task default: [:test]
 namespace :test do
   ENV["ARCONN"] = "sqlserver"
 
-  %w(dblib).each do |mode|
+  %w[dblib].each do |mode|
     Rake::TestTask.new(mode) do |t|
       t.libs = ARTest::SQLServer.test_load_paths
       t.test_files = test_files

data/VERSION

@@ -1 +1 @@
-8.0.10
+8.1.0

data/activerecord-sqlserver-adapter.gemspec

@@ -3,30 +3,29 @@
 version = File.read(File.expand_path("VERSION", __dir__)).strip
 
 Gem::Specification.new do |spec|
-  spec.name          = "activerecord-sqlserver-adapter"
-  spec.platform      = Gem::Platform::RUBY
-  spec.version       = version
+  spec.name = "activerecord-sqlserver-adapter"
+  spec.platform = Gem::Platform::RUBY
+  spec.version = version
 
   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"]
-  spec.email         = ["ken@metaskills.net", "will@wbond.net"]
-  spec.homepage      = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
-  spec.summary       = "ActiveRecord SQL Server Adapter."
-  spec.description   = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
+  spec.license = "MIT"
+  spec.authors = ["Ken Collins", "Anna Carey", "Will Bond", "Murray Steele", "Shawn Balestracci", "Joe Rafaniello", "Tom Ward", "Aidan Haran"]
+  spec.email = ["ken@metaskills.net", "will@wbond.net"]
+  spec.homepage = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
+  spec.summary = "ActiveRecord SQL Server Adapter."
+  spec.description = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
 
-  spec.metadata      = {
+  spec.metadata = {
     "bug_tracker_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues",
     "changelog_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v#{version}/CHANGELOG.md",
-    "source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}",
+    "source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 8.0.0"
-  spec.add_dependency "tiny_tds"
+  spec.add_dependency "activerecord", "~> 8.1.0.rc1"
+  spec.add_dependency "tiny_tds", "~> 3.0"
 end

data/compose.ci.yaml

@@ -1,13 +1,20 @@
-version: "2.2"
 services:
   sqlserver:
     image: ghcr.io/rails-sqlserver/mssql-server-linux-rails
   ci:
     environment:
       - ACTIVERECORD_UNITTEST_HOST=sqlserver
+      - RAILS_BRANCH=8-1-stable
     build:
       context: .
       dockerfile: Dockerfile.ci
     command: wait-for sqlserver:1433 -- bundle exec rake test
     depends_on:
       - "sqlserver"
+  standardrb:
+    environment:
+      - RAILS_BRANCH=8-1-stable
+    build:
+      context: .
+      dockerfile: Dockerfile.ci
+    command: bundle exec standardrb

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

@@ -15,7 +15,7 @@ module ActiveRecord
 
               super(attribute_names).reject do |name|
                 column = self.class.columns_hash[name]
-                column && column.respond_to?(:is_identity?) && column.is_identity?
+                column&.respond_to?(:is_identity?) && column.is_identity?
               end
             end
           end

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

@@ -32,8 +32,7 @@ module ActiveRecord
             executesql = executesql.match(SQLSERVER_STATEMENT_REGEXP).to_a[1]
 
             binds.each_with_index do |bind, index|
-
-              value = if bind.is_a?(::ActiveModel::Attribute)  then
+              value = if bind.is_a?(::ActiveModel::Attribute)
                 connection.quote(bind.value_for_database)
               else
                 connection.quote(bind)

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

@@ -5,6 +5,6 @@ require "active_support/core_ext/kernel/reporting"
 ActiveSupport.on_load(:active_record) do
   silence_warnings do
     # Already defined in Rails
-    ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
+    ActiveRecord::ExplainRegistry::Subscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
   end
 end

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

@@ -24,16 +24,16 @@ module ActiveRecord
           def _construct_relation_for_exists(conditions)
             conditions = sanitize_forbidden_attributes(conditions)
 
-            if distinct_value && offset_value
+            relation = if distinct_value && offset_value
               # Start of monkey-patch
               if select_values.present?
-                relation = order(*select_values).limit!(1)
+                order(*select_values).limit!(1)
               else
-                relation = except(:order).limit!(1)
+                except(:order).limit!(1)
               end
               # End of monkey-patch
             else
-              relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)
+              except(:select, :distinct, :order)._select!(Arel.sql(::ActiveRecord::FinderMethods::ONE_AS_ONE, retryable: true)).limit!(1)
             end
 
             case conditions