activerecord-spanner-adapter 1.8.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e521009bd7ee056c90e4147edd3e6dfe012e7808abf8dcf2b9a0145f380d669d
-  data.tar.gz: 9be31f9f418a9ca5f80531924bc299a75c64826d09989c7318aff88eaccf8a41
+  metadata.gz: 539c47de17139481981cfaaaf2b65d43d8f0b27642ad68663658123d0053a8fb
+  data.tar.gz: c4eb45d075689d08da773ebc11bd1e24df9c6cb7b6ab79a2a352c5c4f4442fbf
 SHA512:
-  metadata.gz: a529d5691fdcecc54e6a090a807c5b5ff561aa2a355d268a605c91b54705a9a093544129da76df2bb5341953a55dfac792be77079aa1b63121260eb8ed9559c3
-  data.tar.gz: 0f6be5f7de6113d16ce2f5e0474924ee4af6bdf3599c84050382f5c47a64f24876b656522e57ebb1e35742e6154221174b0a1e7487fa82034a5a4a5acfa527c2
+  metadata.gz: a7d32fa8e2aeeb7785a35f4d11c2dd1ae2db7298d030b6d0da3f08ef5acb2c19833f4f80bc4b5e4b3b174ff9a34121fe97f50ddae902a3af1505eacec311b790
+  data.tar.gz: 1ec5e7a0370d3bbcc3dd8b0c2b7412f81a57f03703784a0b20476d20d9016d409efcd4f3dc8ecd234e64d1cbedcfe804497fd6b65fd277d7feca014393627edf

data/.github/workflows/acceptance-tests-on-emulator.yaml

@@ -18,14 +18,12 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
-        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "2.7"
-            ar: "~> 7.2.0"
-          - ruby: "3.0"
-            ar: "~> 7.2.0"
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/ci.yaml

@@ -10,14 +10,12 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
-        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "2.7"
-            ar: "~> 7.2.0"
-          - ruby: "3.0"
-            ar: "~> 7.2.0"
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/nightly-acceptance-tests-on-emulator.yaml

@@ -18,14 +18,12 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
-        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "2.7"
-            ar: "~> 7.2.0"
-          - ruby: "3.0"
-            ar: "~> 7.2.0"
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/nightly-unit-tests.yaml

@@ -11,14 +11,12 @@ jobs:
       max-parallel: 4
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
-        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "2.7"
-            ar: "~> 7.2.0"
-          - ruby: "3.0"
-            ar: "~> 7.2.0"
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/rubocop.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: setup ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.3'
     - name: cache gems
       uses: actions/cache@v4
       with:

data/.github/workflows/samples.yaml

@@ -0,0 +1,30 @@
+on:
+  pull_request:
+name: samples
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        # Exclude combinations that are not supported.
+        exclude:
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
+    env:
+      AR_VERSION: ${{ matrix.ar }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: false
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run samples
+      run: bundle exec rake all
+      working-directory: examples/snippets

data/.kokoro/release.cfg

@@ -13,7 +13,7 @@ build_file: "ruby-spanner-activerecord/.kokoro/trampoline_v2.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/ruby-multi"
+  value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/ruby-release"
 }
 
 env_vars: {
@@ -28,7 +28,7 @@ env_vars: {
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,docuploader_service_account"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
 }
 
 # Pick up Rubygems key from internal keystore

data/.kokoro/release.sh

@@ -7,7 +7,4 @@ set -eo pipefail
 export GEM_HOME=$HOME/.gem
 export PATH=$GEM_HOME/bin:$PATH
 
-gem install --no-document toys
-toys release install-python-tools -v
-python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
-toys release perform -v --enable-docs < /dev/null
+toys release perform -v --reporter-org=googleapis --force-republish --enable-rad < /dev/null

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.8.0"
+  ".": "2.1.0"
 }

data/.rubocop.yml

@@ -16,7 +16,7 @@ AllCops:
 
 Documentation:
   Enabled: false
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
@@ -24,7 +24,7 @@ Metrics/ModuleLength:
   Enabled: false
 Naming/RescuedExceptionsVariableName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+### 2.1.0 (2025-03-17)
+
+#### Features
+
+* support IDENTITY columns for auto-generated primary keys ([#352](https://github.com/googleapis/ruby-spanner-activerecord/issues/352)) 
+#### Documentation
+
+* add a test to verify that FOR UPDATE can be used ([#348](https://github.com/googleapis/ruby-spanner-activerecord/issues/348)) 
+* update README with the correct supported versions ([#349](https://github.com/googleapis/ruby-spanner-activerecord/issues/349)) 
+
+### 2.0.0 (2025-01-23)
+
+### ⚠ BREAKING CHANGES
+
+* drop support for Rails 6.1 ([#346](https://github.com/googleapis/ruby-spanner-activerecord/issues/346))
+* deserialize BYTES to StringIO ([#343](https://github.com/googleapis/ruby-spanner-activerecord/issues/343))
+
+#### Features
+
+* drop support for Rails 6.1 ([#346](https://github.com/googleapis/ruby-spanner-activerecord/issues/346)) 
+* support Rails 8.0 ([#331](https://github.com/googleapis/ruby-spanner-activerecord/issues/331)) 
+#### Bug Fixes
+
+* deserialize BYTES to StringIO ([#343](https://github.com/googleapis/ruby-spanner-activerecord/issues/343)) 
+#### Documentation
+
+* add rails dbconsole to list of limitations ([#224](https://github.com/googleapis/ruby-spanner-activerecord/issues/224)) 
+
 ### 1.8.0 (2024-12-12)
 
 #### Features

data/Gemfile

@@ -3,17 +3,18 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-spanner.gemspec
 gemspec
 
-gem "activerecord", ENV.fetch("AR_VERSION", "~> 7.1.0")
+ar_version = ENV.fetch("AR_VERSION", "~> 7.1.0")
+gem "activerecord", ar_version
 gem "ostruct"
 gem "minitest", "~> 5.25.0"
 gem "minitest-rg", "~> 5.3.0"
-gem "pry", "~> 0.13.0"
-gem "pry-byebug", "~> 3.9.0"
+gem "pry", "~> 0.14.2"
+gem "pry-byebug", "~> 3.10.1"
 # Add sqlite3 for testing for compatibility with other adapters.
-gem 'sqlite3', '~> 1.4'
+gem 'sqlite3'
 
 # Required for samples and testing.
-install_if -> { ENV.fetch("AR_VERSION", "~> 7.1.0").dup.to_s.sub("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
+install_if -> { ar_version.dup.to_s.sub("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
   gem "composite_primary_keys"
 end
 

data/README.md

@@ -4,16 +4,17 @@
 
 ![rubocop](https://github.com/googleapis/ruby-spanner-activerecord/workflows/rubocop/badge.svg)
 
-__This adapter only supports GoogleSQL-dialect Cloud Spanner databases. PostgreSQL-dialect
+__This adapter only supports GoogleSQL-dialect Spanner databases. PostgreSQL-dialect
 databases are not supported. You can use the standard PostgreSQL ActiveRecord adapter in
 [combination with PGAdapter](https://github.com/GoogleCloudPlatform/pgadapter/blob/-/samples/ruby/activerecord)
-for Cloud Spanner PostgreSQL-dialect databases.__
+for Spanner PostgreSQL-dialect databases.__
 
-This project provides a Cloud Spanner adapter for ActiveRecord. It supports the following versions:
+This project provides a Spanner adapter for ActiveRecord. It supports the following versions:
 
-- ActiveRecord 6.0.x with Ruby 2.7.
-- ActiveRecord 6.1.x with Ruby 2.7 and higher.
-- ActiveRecord 7.0.x with Ruby 2.7 and higher.
+- ActiveRecord 7.0.x with Ruby 3.1 and higher.
+- ActiveRecord 7.1.x with Ruby 3.1 and higher.
+- ActiveRecord 7.2.x with Ruby 3.1 and higher.
+- ActiveRecord 8.0.x with Ruby 3.2 and higher.
 
 Known limitations are listed in the [Limitations](#limitations) section.
 Please report any problems that you might encounter by [creating a new issue](https://github.com/googleapis/ruby-spanner-activerecord/issues/new).
@@ -41,7 +42,7 @@ And then execute:
 ### Migrations
 __Use DDL batching when executing migrations for the best possible performance.__
 
-Executing multiple schema changes on Cloud Spanner can take a long time. It is therefore
+Executing multiple schema changes on Spanner can take a long time. It is therefore
 strongly recommended that you limit the number of schema change operations. You can do
 this by using DDL batching in your migrations. See [the migrations examples](examples/snippets/migrations)
 for how to do this.
@@ -62,8 +63,8 @@ development:
 To get started with Rails, read the tutorial under {file:examples/rails/README.md examples/rails/README.md}.
 
 You can also find a list of short self-contained code examples that show how
-to use ActiveRecord with Cloud Spanner under the directory [examples/snippets](examples/snippets). Each example is directly runnable without the need to setup a Cloud Spanner
-database, as all samples will automatically start a Cloud Spanner emulator in a Docker container and execute the sample
+to use ActiveRecord with Spanner under the directory [examples/snippets](examples/snippets). Each example is directly runnable without the need to setup a Spanner
+database, as all samples will automatically start a Spanner emulator in a Docker container and execute the sample
 code against that emulator. All samples can be executed by navigating to the sample directory on your local machine and
 then executing the command `bundle exec rake run`. Example:
 
@@ -76,28 +77,31 @@ __NOTE__: You do need to have [Docker](https://docs.docker.com/get-docker/) inst
 
 Some noteworthy examples in the snippets directory:
 - [quickstart](examples/snippets/quickstart): A simple application that shows how to create and query a simple database containing two tables.
-- [migrations](examples/snippets/migrations): Shows a best-practice for executing migrations on Cloud Spanner.
+- [migrations](examples/snippets/migrations): Shows a best-practice for executing migrations on Spanner.
+- [auto-generated-primary-key](examples/snippets/auto-generated-primary-key): Shows how to use IDENTITY columns for primary keys.
 - [bit-reversed-sequences](examples/snippets/bit-reversed-sequence): Shows how to use bit-reversed sequences for primary keys.
-- [read-write-transactions](examples/snippets/read-write-transactions): Shows how to execute transactions on Cloud Spanner.
-- [read-only-transactions](examples/snippets/read-only-transactions): Shows how to execute read-only transactions on Cloud Spanner.
+- [read-write-transactions](examples/snippets/read-write-transactions): Shows how to execute transactions on Spanner.
+- [read-only-transactions](examples/snippets/read-only-transactions): Shows how to execute read-only transactions on Spanner.
 - [bulk-insert](examples/snippets/bulk-insert): Shows the best way to insert a large number of new records.
 - [mutations](examples/snippets/mutations): Shows how you can use [mutations instead of DML](https://cloud.google.com/spanner/docs/dml-versus-mutations)
-  for inserting, updating and deleting data in a Cloud Spanner database. Mutations can have a significant performance
+  for inserting, updating and deleting data in a Spanner database. Mutations can have a significant performance
   advantage compared to DML statements, but do not allow read-your-writes semantics during a transaction.
 - [array-data-type](examples/snippets/array-data-type): Shows how to work with `ARRAY` data types.
 - [interleaved-tables](examples/snippets/interleaved-tables-before-7.1): Shows how to work with [Interleaved Tables](https://cloud.google.com/spanner/docs/schema-and-data-model#create-interleaved-tables).
 
 ## Limitations
 
-| Limitation                                                                                                                        | Comment                                                                                                                                                                                                                           | Resolution                                                                                  |
-|-----------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
-| Interleaved tables require composite primary keys                                                                                 | Cloud Spanner requires composite primary keys for interleaved tables. See {file:examples/snippets/interleaved-tables/README.md this example} for an example on how to use interleaved tables with ActiveRecord                        | Use composite primary keys.                                                                 |
-| Lack of sequential IDs                                                                                                            | Cloud Spanner uses either using bit-reversed sequences or UUID4 to generated primary keys to avoid [hotspotting](https://cloud.google.com/spanner/docs/schema-design#uuid_primary_key) so you SHOULD NOT rely on IDs being sorted | Use either UUID4s or bit-reversed sequences to automatically generate primary keys.         |
-| Table without Primary Key                                                                                                         | Cloud Spanner support does not support tables without a primary key.                                                                                                                                                              | Always define a primary key for your table.                                                 |
-| Table names CANNOT have spaces within them whether back-ticked or not                                                             | Cloud Spanner DOES NOT support tables with spaces in them for example `Entity ID`                                                                                                                                                 | Ensure that your table names don't contain spaces.                                          |
-| Table names CANNOT have punctuation marks and MUST contain valid UTF-8                                                            | Cloud Spanner DOES NOT support punctuation marks e.g. periods ".", question marks "?" in table names                                                                                                                              | Ensure that your table names don't contain punctuation marks.                               |
-| Index with fields length [add_index](https://apidock.com/rails/v5.2.3/ActiveRecord/ConnectionAdapters/SchemaStatements/add_index) | Cloud Spanner does not support index with fields length                                                                                                                                                                           | Ensure that your database definition does not include index definitions with field lengths. |
-| Only GoogleSQL-dialect databases                                                                                                  | Cloud Spanner supports both GoogleSQL- and PostgreSQL-dialect databases. This adapter only supports GoogleSQL-dialect databases.                                                                                                  | Ensure that your database uses the GoogleSQL dialect.                                       |
+| Limitation                                                                                                                         | Comment                                                                                                                                                                                                                                                                                                                                           | Resolution                                                                                    |
+|------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
+| Interleaved tables require composite primary keys                                                                                  | Spanner requires composite primary keys for interleaved tables. See {file:examples/snippets/interleaved-tables/README.md this example} for an example on how to use interleaved tables with ActiveRecord                                                                                                                                              | Use composite primary keys.                                                                   |
+| Lack of sequential IDs                                                                                                             | Spanner uses either bit-reversed IDENTITY columns or sequences to generated primary keys to avoid [hotspotting](https://cloud.google.com/spanner/docs/schema-design#uuid_primary_key) so you SHOULD NOT rely on IDs being sorted                                                                                                                  | Use either IDENTITY columns or bit-reversed sequences to automatically generate primary keys. |
+| Table without Primary Key                                                                                                          | Spanner support does not support tables without a primary key.                                                                                                                                                                                                                                                                                    | Always define a primary key for your table.                                                   |
+| Table names CANNOT have spaces within them whether back-ticked or not                                                              | Spanner DOES NOT support tables with spaces in them for example `Entity ID`                                                                                                                                                                                                                                                                       | Ensure that your table names don't contain spaces.                                            |
+| Table names CANNOT have punctuation marks and MUST contain valid UTF-8                                                             | Spanner DOES NOT support punctuation marks e.g. periods ".", question marks "?" in table names                                                                                                                                                                                                                                                    | Ensure that your table names don't contain punctuation marks.                                 |
+| Index with fields length [add_index](https://apidock.com/rails/v5.2.3/ActiveRecord/ConnectionAdapters/SchemaStatements/add_index)  | Spanner does not support index with fields length                                                                                                                                                                                                                                                                                                 | Ensure that your database definition does not include index definitions with field lengths.   |
+| Only GoogleSQL-dialect databases                                                                                                   | Spanner supports both GoogleSQL- and PostgreSQL-dialect databases. This adapter only supports GoogleSQL-dialect databases. You can use the [PostgreSQL ActiveRecord provider in combination with PGAdapter](https://github.com/GoogleCloudPlatform/pgadapter/tree/postgresql-dialect/samples/ruby/activerecord) for Spanner PostgreSQL databases. |                                                                                               |
+| `rails dbconsole` is not supported.                                                                                                | The `rails dbconsole` is not supported for Spanner databases.                                                                                                                                                                                                                                                                                     |                                                                                               |
+
 
 ## Contributing
 

data/acceptance/cases/migration/command_recorder_test.rb

@@ -13,9 +13,6 @@ module ActiveRecord
     class CommandRecorderTest < SpannerAdapter::TestCase
       include SpannerAdapter::Migration::TestHelper
 
-      VERSION_6_1_0 = Gem::Version.create "6.1.0"
-      VERSION_6_0_3 = Gem::Version.create "6.0.3"
-
       def setup
         skip_test_table_create!
         super
@@ -203,20 +200,12 @@ module ActiveRecord
 
       def test_invert_add_index
         remove = @recorder.inverse_of :add_index, [:table, [:one, :two]]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:remove_index, [:table, { column: [:one, :two] }]], remove
-        else
-          assert_equal [:remove_index, [:table, [:one, :two]], nil], remove
-        end
+        assert_equal [:remove_index, [:table, [:one, :two]], nil], remove
       end
 
       def test_invert_add_index_with_name
         remove = @recorder.inverse_of :add_index, [:table, [:one, :two], name: "new_index"]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:remove_index, [:table, { name: "new_index" }]], remove
-        else
-          assert_equal [:remove_index, [:table, [:one, :two], {:name=>"new_index"}], nil], remove
-        end
+        assert_equal [:remove_index, [:table, [:one, :two], {:name=>"new_index"}], nil], remove
       end
 
       def test_invert_remove_index
@@ -226,11 +215,7 @@ module ActiveRecord
 
       def test_invert_remove_index_with_options
         add = @recorder.inverse_of :remove_index, [:table, { column: :one }]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:add_index, [:table, :one, {} ]], add
-        else
-          assert_equal [:add_index, [:table, :one ]], add
-        end
+        assert_equal [:add_index, [:table, :one ]], add
       end
 
       def test_invert_remove_index_with_positional_column
@@ -250,11 +235,7 @@ module ActiveRecord
 
       def test_invert_remove_index_with_no_special_options
         add = @recorder.inverse_of :remove_index, [:table, { column: [:one, :two] }]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:add_index, [:table, [:one, :two], {}]], add
-        else
-          assert_equal [:add_index, [:table, [:one, :two]]], add
-        end
+        assert_equal [:add_index, [:table, [:one, :two]]], add
       end
 
       def test_invert_remove_index_with_no_column
@@ -315,11 +296,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, :people]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people], nil], enable
       end
 
       def test_invert_remove_foreign_key
@@ -329,11 +306,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key_with_column
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people, column: "owner_id"]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, column: "owner_id"]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people, column: "owner_id"], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people, column: "owner_id"], nil], enable
       end
 
       def test_invert_remove_foreign_key_with_column
@@ -343,11 +316,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key_with_column_and_name
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people, column: "owner_id", name: "fk"]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, { name: "fk" }]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people, { column: "owner_id", name: "fk" }], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people, { column: "owner_id", name: "fk" }], nil], enable
       end
 
       def test_invert_remove_foreign_key_with_column_and_name

data/acceptance/cases/migration/references_index_test.rb

@@ -76,12 +76,7 @@ module ActiveRecord
             t.references :foo, polymorphic: true, index: true
           end
         end
-
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo_type_and_foo_id)
-        else
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
-        end
+        assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
       end
 
       def test_creates_index_for_existing_table
@@ -124,11 +119,7 @@ module ActiveRecord
           end
         end
 
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo_type_and_foo_id)
-        else
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
-        end
+        assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
       end
     end
   end

data/acceptance/cases/models/binary_identifiers.rb

@@ -0,0 +1,97 @@
+# Copyright 2025 Google LLC
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+# frozen_string_literal: true
+
+require "test_helper"
+require "test_helpers/with_separate_database"
+require_relative "../../models/user"
+require_relative "../../models/binary_project"
+
+module Models
+  class DefaultValueTest < SpannerAdapter::TestCase
+    include TestHelpers::WithSeparateDatabase
+
+    def setup
+      super
+
+      connection.create_table :users, id: :binary do |t|
+        t.string :email, null: false
+        t.string :full_name, null: false
+      end
+      connection.create_table :binary_projects, id: :binary do |t|
+        t.string :name, null: false
+        t.string :description, null: false
+        t.binary :owner_id, null: false
+        t.foreign_key :users, column: :owner_id
+      end
+    end
+
+    def test_includes_works
+      user = User.create!(
+        email: "test@example.com",
+        full_name: "Test User"
+      )
+      3.times do |i|
+        Project.create!(
+          name: "Project #{i}",
+          description: "Description #{i}",
+          owner: user
+        )
+      end
+
+      # First verify the association works without includes
+      projects = Project.all
+      assert_equal 3, projects.count
+
+      # Compare the base64 content instead of the StringIO objects
+      first_project = projects.first
+      assert_equal to_base64(user.id), to_base64(first_project.owner_id)
+
+      # Now verify includes is working
+      query_count = count_queries do
+        loaded_projects = Project.includes(:owner).to_a
+        loaded_projects.each do |project|
+          # Access the owner to ensure it's preloaded
+          assert_equal user.full_name, project.owner.full_name
+        end
+        assert_equal 3, loaded_projects.count
+      end
+
+      # Spanner should execute 2 queries: one for projects and one for users
+      assert_equal 2, query_count
+
+      user = User.all.includes(:projects).first
+      assert user
+      project_count = 0
+      user.projects.each do |_|
+        project_count += 1
+      end
+      assert_equal 3, project_count
+      assert_equal 3, user.projects.count
+    end
+
+    private
+
+    def to_base64 buffer
+      buffer.rewind
+      value = buffer.read
+      Base64.strict_encode64 value.force_encoding("ASCII-8BIT")
+    end
+
+    def count_queries(&block)
+      count = 0
+      counter_fn = ->(name, started, finished, unique_id, payload) {
+        unless %w[CACHE SCHEMA].include?(payload[:name])
+          count += 1
+        end
+      }
+
+      ActiveSupport::Notifications.subscribed(counter_fn, "sql.active_record", &block)
+      count
+    end
+  end
+end

data/acceptance/cases/models/default_value_test.rb

@@ -31,7 +31,7 @@ module Models
         t.column :col_timestamp, :datetime, default: default.col_timestamp
       end
 
-      item = LiteralValue.new
+      item = LiteralValue.new id: connection.next_sequence_value(nil)
       default.each_pair { |col, expected| assert_equal(expected, item[col]) }
       item.save!
       default.each_pair { |col, expected| assert_equal(expected, item[col]) }
@@ -45,7 +45,7 @@ module Models
         t.column :col_timestamp, :datetime, default: -> { "CURRENT_TIMESTAMP()" }
       end
 
-      item = ExpressionValue.create!
+      item = ExpressionValue.create! id: connection.next_sequence_value(nil)
       item.reload
       assert_equal(BigDecimal("1.23"), item.col_numeric)
       assert(item.col_timestamp)