activerecord-spanner-adapter 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35016d190d27c935b9a004570e326d7cdc75af064f877bd619334ea967cf4d7a
-  data.tar.gz: 1cf91b818edc4d594fcf623f0a3218927406b47523931641fb6e844c88b578ff
+  metadata.gz: e5132b6ef0337fa324c42c5b61ff6bee8e745352c58c46afc5f583a253fc6571
+  data.tar.gz: 699d2b993d739c78fc95fc12b30189e512517111aa9ae787d929b9d3ac828576
 SHA512:
-  metadata.gz: 96dfb48e59b278093e118006e393e03b8981fd370605664830a73ad09873ead412a726a838407595fb903194e64f7b368dc940a443d774847679c316742eefc3
-  data.tar.gz: 5aa61e971ad3b21f9a9dee3476e7ce9fe5b52f080c2bd507e39cd2aa90719802d0ba5bcd024c3fa521feabc1e8756a249757dda5d3d432c67111ea3479d50e17
+  metadata.gz: 3d97e90c71f7dad83a35fc6cfb1921c24989d88b050c88b75ff444dbc58d4c0c2a9abbde2f8197d700dca121dda5c12853e4f6cae6c27bfc0520c7facbff3338
+  data.tar.gz: 5dbb5523a45941eff16db888d0af3c5ab7ea3e54af9e94d0f0943cef2a9b6d5e39078df1a1761e05a436910906cd19825f84f298d8e2b9043d79981dff51b4f7

data/.github/CODEOWNERS

@@ -4,4 +4,4 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-*     @googleapis/ruby-team @olavloite @rahul2393 @ansh0l
+*     @googleapis/cloud-sdk-ruby-team @olavloite @rahul2393 @ansh0l

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

@@ -19,11 +19,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"
@@ -33,7 +35,7 @@ jobs:
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):

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

@@ -26,7 +26,7 @@ jobs:
       matrix:
         ruby: [3.3]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):
@@ -35,17 +35,17 @@ jobs:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - name: Authenticate Google Cloud
-      uses: google-github-actions/auth@v2
+      uses: google-github-actions/auth@v3
       with:
         credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v2
+      uses: google-github-actions/setup-gcloud@v3
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on production
-      run: bundle exec rake acceptance\[,,,"exclude cases/migration"\]
+      run: bundle exec rake acceptance\[,,,"exclude cases/migration"\] TESTOPTS="-v"
       env:
         SPANNER_TEST_PROJECT: ${{ secrets.GCP_PROJECT_ID }}
         SPANNER_TEST_INSTANCE: ruby-activerecord-test

data/.github/workflows/ci.yaml

@@ -11,11 +11,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"
@@ -25,7 +27,7 @@ jobs:
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):

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

@@ -19,11 +19,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"
@@ -33,7 +35,7 @@ jobs:
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

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

@@ -12,7 +12,7 @@ jobs:
       matrix:
         ruby: [3.3]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):
@@ -21,11 +21,11 @@ jobs:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - name: Authenticate Google Cloud
-      uses: google-github-actions/auth@v2
+      uses: google-github-actions/auth@v3
       with:
         credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v2
+      uses: google-github-actions/setup-gcloud@v3
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
     - name: Install dependencies

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

@@ -12,11 +12,13 @@ jobs:
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"
@@ -26,7 +28,7 @@ jobs:
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/rubocop.yaml

@@ -12,13 +12,13 @@ jobs:
     timeout-minutes: 10
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: setup ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
+        ruby-version: '3.4.8'
     - name: cache gems
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}

data/.github/workflows/samples.yaml

@@ -23,7 +23,7 @@ jobs:
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.3.0"
+  ".": "2.5.0"
 }

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+### 2.5.0 (2026-02-11)
+
+#### Features
+
+* add support for the UUID data type ([#387](https://github.com/googleapis/ruby-spanner-activerecord/issues/387)) 
+* support ActiveRecord 8.1.x ([#385](https://github.com/googleapis/ruby-spanner-activerecord/issues/385)) 
+#### Documentation
+
+* update README to reflect support for Rails 8.1.x ([#388](https://github.com/googleapis/ruby-spanner-activerecord/issues/388)) 
+
+### 2.4.0 (2026-02-04)
+
+#### Features
+
+* Add automatic PDML fallback for mutation limit errors ([#369](https://github.com/googleapis/ruby-spanner-activerecord/issues/369)) 
+* Adding support for exclude_txn_from_change_streams option ([#368](https://github.com/googleapis/ruby-spanner-activerecord/issues/368)) ([1b04c70](https://github.com/googleapis/ruby-spanner-activerecord/commit/1b04c70b4ecec62403449af11827d0f3587acfd0)), closes [#367](https://github.com/googleapis/ruby-spanner-activerecord/issues/367)
+* Batch DML support ([#370](https://github.com/googleapis/ruby-spanner-activerecord/issues/370)) 
+* support commit_options ([#364](https://github.com/googleapis/ruby-spanner-activerecord/issues/364)) ([0a1020a](https://github.com/googleapis/ruby-spanner-activerecord/commit/0a1020ac60ff9ddaae1634a2178a71bc0de9480c)), closes [#365](https://github.com/googleapis/ruby-spanner-activerecord/issues/365)
+
 ### 2.3.0 (2025-05-30)
 
 #### Features

data/Gemfile

@@ -6,10 +6,11 @@ gemspec
 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 "minitest", "~> 5.27.0"
+gem "minitest-rg", "~> 5.4.0"
 gem "pry", "~> 0.14.2"
 gem "pry-byebug", "~> 3.11.0"
+gem "mutex_m"
 # Add sqlite3 for testing for compatibility with other adapters.
 gem 'sqlite3'
 

data/README.md

@@ -15,6 +15,7 @@ This project provides a Spanner adapter for ActiveRecord. It supports the follow
 - 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.
+- ActiveRecord 8.1.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).

data/acceptance/cases/migration/index_test.rb

@@ -57,7 +57,7 @@ module ActiveRecord
         e = assert_raises(ArgumentError) {
           connection.rename_index(table_name, "old_idx", too_long_index_name)
         }
-        assert_match(/too long; the limit is #{connection.index_name_length} characters/, e.message)
+        assert_match(/too long/, e.message)
 
         assert connection.index_name_exists?(table_name, "old_idx")
       end
@@ -79,7 +79,7 @@ module ActiveRecord
         e = assert_raises(ArgumentError) {
           connection.add_index(table_name, "foo", name: too_long_index_name)
         }
-        assert_match(/too long; the limit is #{connection.index_name_length} characters/, e.message)
+        assert_match(/too long/, e.message)
 
         assert_not connection.index_name_exists?(table_name, too_long_index_name)
         connection.add_index(table_name, "foo", name: good_index_name)

data/acceptance/cases/tasks/database_tasks_test.rb

@@ -86,6 +86,8 @@ module ActiveRecord
           filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(config_name, :sql)
         elsif ActiveRecord::Tasks::DatabaseTasks.respond_to?(:schema_dump_path)
           filename = ActiveRecord::Tasks::DatabaseTasks.schema_dump_path(db_config, :sql)
+        else
+          raise "No schema file specified"
         end
         ActiveRecord::Tasks::DatabaseTasks.dump_schema db_config, :sql
         sql = File.read(filename)
@@ -98,10 +100,21 @@ module ActiveRecord
         else
           assert_equal expected_schema_sql_on_production, sql, msg = sql
         end
-        drop_database
-        create_database
-        ActiveRecord::Tasks::DatabaseTasks.load_schema db_config, :sql
-        assert_equal tables, connection.tables.sort
+
+        # Skip the drop-and-recreate test on production, for two reasons:
+        # 1. It is relatively slow.
+        # 2. Dropping and re-creating a database with the same name while keeping the connection open
+        #    causes 'Database not found' errors to be returned (by the session that is used?)
+        if ENV["SPANNER_EMULATOR_HOST"]
+          drop_database
+          create_database
+          begin
+            ActiveRecord::Tasks::DatabaseTasks.load_schema db_config, :sql, file = filename
+          rescue StandardError => e
+            puts "Loading schema failed: #{e}"
+          end
+          assert_equal tables, connection.tables.sort
+        end
       end
 
       def expected_schema_sql_on_emulator
@@ -116,6 +129,7 @@ module ActiveRecord
   col_date DATE,
   col_timestamp TIMESTAMP,
   col_json JSON,
+  col_uuid UUID,
   col_array_string ARRAY<STRING(MAX)>,
   col_array_int64 ARRAY<INT64>,
   col_array_float64 ARRAY<FLOAT64>,
@@ -125,6 +139,7 @@ module ActiveRecord
   col_array_date ARRAY<DATE>,
   col_array_timestamp ARRAY<TIMESTAMP>,
   col_array_json ARRAY<JSON>,
+  col_array_uuid ARRAY<UUID>,
 ) PRIMARY KEY(id);
 CREATE TABLE firms (
   id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
@@ -274,6 +289,7 @@ INSERT INTO `schema_migrations` (version) VALUES
   col_date DATE,
   col_timestamp TIMESTAMP,
   col_json JSON,
+  col_uuid UUID,
   col_array_string ARRAY<STRING(MAX)>,
   col_array_int64 ARRAY<INT64>,
   col_array_float64 ARRAY<FLOAT64>,
@@ -283,6 +299,7 @@ INSERT INTO `schema_migrations` (version) VALUES
   col_array_date ARRAY<DATE>,
   col_array_timestamp ARRAY<TIMESTAMP>,
   col_array_json ARRAY<JSON>,
+  col_array_uuid ARRAY<UUID>,
 ) PRIMARY KEY(id);
 CREATE TABLE firms (
   id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
@@ -450,6 +467,7 @@ CREATE TABLE all_types (
   col_date DATE,
   col_timestamp TIMESTAMP,
   col_json JSON,
+  col_uuid UUID,
   col_array_string ARRAY<STRING(MAX)>,
   col_array_int64 ARRAY<INT64>,
   col_array_float64 ARRAY<FLOAT64>,
@@ -459,6 +477,7 @@ CREATE TABLE all_types (
   col_array_date ARRAY<DATE>,
   col_array_timestamp ARRAY<TIMESTAMP>,
   col_array_json ARRAY<JSON>,
+  col_array_uuid ARRAY<UUID>,
 ) PRIMARY KEY(id);
 CREATE TABLE ar_internal_metadata (
   key STRING(MAX) NOT NULL,
@@ -611,6 +630,7 @@ CREATE TABLE all_types (
   col_date DATE,
   col_timestamp TIMESTAMP,
   col_json JSON,
+  col_uuid UUID,
   col_array_string ARRAY<STRING(MAX)>,
   col_array_int64 ARRAY<INT64>,
   col_array_float64 ARRAY<FLOAT64>,
@@ -620,6 +640,7 @@ CREATE TABLE all_types (
   col_array_date ARRAY<DATE>,
   col_array_timestamp ARRAY<TIMESTAMP>,
   col_array_json ARRAY<JSON>,
+  col_array_uuid ARRAY<UUID>,
 ) PRIMARY KEY(id);
 CREATE TABLE ar_internal_metadata (
   key STRING(MAX) NOT NULL,

data/acceptance/cases/transactions/read_write_transactions_test.rb

@@ -273,6 +273,35 @@ module ActiveRecord
           TableWithSequence.connection.use_client_side_id_for_mutations = reset_value
         end
       end
+
+      def test_single_dml_succeeds_with_fallback_to_pdml_enabled
+        # This test verifies that a normal, successful DML statement works as
+        # expected when the fallback isolation is enabled. Because no mutation
+        # limit error occurs, the fallback to PDML should NOT be triggered.
+        create_test_records
+        assert_equal 1, Author.count
+
+        Author.transaction isolation: :fallback_to_pdml do
+          Author.where(name: "David").delete_all
+        end
+
+        assert_equal 0, Author.count, "The record should have been deleted"
+      end
+
+      def test_other_errors_do_not_trigger_fallback
+        # This test ensures that if a transaction with fallback enabled fails
+        # for a reason OTHER than the mutation limit, it fails normally and
+        # does not attempt to fall back to PDML.
+        create_test_records
+        initial_author_count = Author.count
+
+        assert_raises ActiveRecord::StatementInvalid do
+          Author.transaction isolation: :fallback_to_pdml do
+            Author.create! name: nil
+          end
+        end
+        assert_equal initial_author_count, Author.count, "Transaction should have rolled back"
+      end
     end
   end
 end

data/acceptance/cases/type/all_types_test.rb

@@ -30,7 +30,8 @@ module ActiveRecord
         AllTypes.create col_string: "string", col_int64: 100, col_float64: 3.14, col_numeric: 6.626, col_bool: true,
           col_bytes: StringIO.new("bytes"), col_date: ::Date.new(2021, 6, 23),
           col_timestamp: ::Time.new(2021, 6, 23, 17, 8, 21, "+02:00"),
-          col_json: { kind: "user_renamed", change: %w[jack john]},
+          col_json: { kind: "user_renamed", change: %w[jack john] },
+          col_uuid: "3840ba25-55df-4cb7-a210-1fe37278954f",
           col_array_string: ["string1", nil, "string2"],
           col_array_int64: [100, nil, 200, "300"],
           col_array_float64: [3.14, nil, 2.0/3.0, "3.14"],
@@ -42,7 +43,8 @@ module ActiveRecord
                                 ::Time.new(2021, 6, 24, 17, 8, 21, "+02:00"), "2021-06-25 17:08:21 +02:00"],
           col_array_json: [{ kind: "user_renamed", change: %w[jack john]}, nil, \
                              { kind: "user_renamed", change: %w[alice meredith]},
-                             "{\"kind\":\"user_renamed\",\"change\":[\"bob\",\"carol\"]}"]
+                             "{\"kind\":\"user_renamed\",\"change\":[\"bob\",\"carol\"]}"],
+          col_array_uuid: ["e986c19c-9bf3-44f8-851d-710ad3d0067b", nil, "a02f50b6-2860-48dc-acd6-49b42abc3094"]
       end
 
       def test_create_record
@@ -67,6 +69,7 @@ module ActiveRecord
           assert_equal ::Time.new(2021, 6, 23, 17, 8, 21, "+02:00").utc, record.col_timestamp.utc
           assert_equal ({"kind" => "user_renamed", "change" => %w[jack john]}),
                        record.col_json
+          assert_equal "3840ba25-55df-4cb7-a210-1fe37278954f", record.col_uuid
 
           assert_equal ["string1", nil, "string2"], record.col_array_string
           assert_equal [100, nil, 200, 300], record.col_array_int64
@@ -85,6 +88,7 @@ module ActiveRecord
                         {"kind" => "user_renamed", "change" => %w[alice meredith]}, \
                         "{\"kind\":\"user_renamed\",\"change\":[\"bob\",\"carol\"]}"],
                        record.col_array_json
+          assert_equal ["e986c19c-9bf3-44f8-851d-710ad3d0067b", nil, "a02f50b6-2860-48dc-acd6-49b42abc3094"], record.col_array_uuid
         end
       end
 
@@ -100,6 +104,7 @@ module ActiveRecord
                           col_date: ::Date.new(2021, 6, 28),
                           col_timestamp: ::Time.new(2021, 6, 28, 11, 22, 21, "+02:00"),
                           col_json: { kind: "user_created", change: %w[jack alice]},
+                          col_uuid: "b493579f-f4f6-41f6-a520-8373ecf1cde4",
                           col_array_string: ["new string 1", "new string 2"],
                           col_array_int64: [300, 200, 100],
                           col_array_float64: [1.1, 2.2, 3.3],
@@ -108,7 +113,8 @@ module ActiveRecord
                           col_array_bytes: [StringIO.new("new bytes 1"), StringIO.new("new bytes 2")],
                           col_array_date: [::Date.new(2021, 6, 28)],
                           col_array_timestamp: [::Time.utc(2020, 12, 31, 0, 0, 0)],
-                          col_array_json: [{ kind: "user_created", change: %w[jack alice]}]
+                          col_array_json: [{ kind: "user_created", change: %w[jack alice]}],
+                          col_array_uuid: ["a664b1eb-4dc7-4795-9ed8-28fab6644cea", nil, "1c794d81-bc6d-4771-9c92-a920d28a7aaa"]
           end
 
           # Verify that the record was updated.
@@ -123,6 +129,7 @@ module ActiveRecord
           assert_equal ::Time.new(2021, 6, 28, 11, 22, 21, "+02:00").utc, record.col_timestamp.utc
           assert_equal ({"kind" => "user_created", "change" => %w[jack alice]}),
                      record.col_json
+          assert_equal "b493579f-f4f6-41f6-a520-8373ecf1cde4", record.col_uuid
 
           assert_equal ["new string 1", "new string 2"], record.col_array_string
           assert_equal [300, 200, 100], record.col_array_int64
@@ -135,6 +142,8 @@ module ActiveRecord
           assert_equal [::Time.utc(2020, 12, 31, 0, 0, 0)], record.col_array_timestamp.map(&:utc)
           assert_equal [{"kind" => "user_created", "change" => %w[jack alice]}],
                        record.col_array_json
+          assert_equal ["a664b1eb-4dc7-4795-9ed8-28fab6644cea", nil, "1c794d81-bc6d-4771-9c92-a920d28a7aaa"],
+                       record.col_array_uuid
         end
       end
 
@@ -151,7 +160,8 @@ module ActiveRecord
               col_array_bytes: [],
               col_array_date: [],
               col_array_timestamp: [],
-              col_array_json: []
+              col_array_json: [],
+              col_array_uuid: []
           end
 
           record = AllTypes.find record.id
@@ -164,6 +174,7 @@ module ActiveRecord
           assert_equal [], record.col_array_date
           assert_equal [], record.col_array_timestamp
           assert_equal [], record.col_array_json
+          assert_equal [], record.col_array_uuid
         end
       end
     end

data/acceptance/schema/schema.rb

@@ -24,6 +24,7 @@ def create_tables_in_test_schema
         t.column :col_date, :date
         t.column :col_timestamp, :datetime
         t.column :col_json, :json
+        t.column :col_uuid, :uuid
 
         t.column :col_array_string, :string, array: true
         t.column :col_array_int64, :bigint, array: true
@@ -34,6 +35,7 @@ def create_tables_in_test_schema
         t.column :col_array_date, :date, array: true
         t.column :col_array_timestamp, :datetime, array: true
         t.column :col_array_json, :json, array: true
+        t.column :col_array_uuid, :uuid, array: true
       end
 
       create_table :firms do |t|

data/activerecord-spanner-adapter.gemspec

@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", [">= 7.0", "< 9"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", [">= 2.0", "< 5.0"]
   spec.add_development_dependency "google-style", "~> 1.31.0"
   spec.add_development_dependency "minitest", "~> 5.10"
   spec.add_development_dependency "minitest-autotest", "~> 1.0"
   spec.add_development_dependency "minitest-focus", "~> 1.1"
-  spec.add_development_dependency "minitest-rg", "~> 5.2"
+  spec.add_development_dependency "minitest-rg", "~> 5.4"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "redcarpet", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.9"

data/examples/snippets/batch-dml/README.md

@@ -0,0 +1,13 @@
+# Sample - Batch DML
+
+This example shows how to use [Batch DML](https://cloud.google.com/spanner/docs/dml-tasks#use-batch)
+with the Spanner ActiveRecord adapter.
+
+The sample will automatically start a Spanner Emulator in a docker container and execute the sample
+against that emulator. The emulator will automatically be stopped when the application finishes.
+
+Run the application with the command
+
+```bash
+bundle exec rake run
+```

data/examples/snippets/batch-dml/Rakefile

@@ -0,0 +1,13 @@
+# 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.
+
+require_relative "../config/environment"
+require "sinatra/activerecord/rake"
+
+desc "Sample showing how to use Batch DML with the Spanner ActiveRecord provider."
+task :run do
+  Dir.chdir("..") { sh "bundle exec rake run[batch-dml]" }
+end

data/examples/snippets/batch-dml/application.rb

@@ -0,0 +1,54 @@
+# 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.
+
+require "io/console"
+require_relative "../config/environment"
+require_relative "models/singer"
+require_relative "models/album"
+
+class Application
+  def self.run
+    first_names = %w[Pete Alice John Ethel Trudy Naomi Wendy Ruben Thomas Elly]
+    last_names = %w[Wendelson Allison Peterson Johnson Henderson Ericsson Aronson Tennet Courtou]
+
+    # Insert 5 new singers using Batch DML.
+    ActiveRecord::Base.transaction do
+      # The Base.dml_batch function starts a DML batch. All DML statements that are
+      # generated by ActiveRecord inside the block that is given will be added to
+      # the current batch. The batch is executed at the end of the block. The data
+      # that has been written is readable after the block ends.
+      ActiveRecord::Base.dml_batch do
+        5.times do
+          Singer.create first_name: first_names.sample, last_name: last_names.sample
+        end
+      end
+      # Data that has been inserted/update using Batch DML can be read in the same
+      # transaction as the one that added/updated the data. This is different from
+      # mutations, as mutations do not support read-your-writes.
+      singers = Singer.all
+      puts "Inserted #{singers.count} singers in one batch"
+    end
+
+    # Batch DML can also be used to update existing data.
+    ActiveRecord::Base.transaction do
+      # Start a DML batch.
+      singers = nil
+      ActiveRecord::Base.dml_batch do
+        # Queries can be executed inside a DML batch.
+        # These are executed directly and do not affect the DML batch.
+        singers = Singer.all
+        singers.each do |singer|
+          singer.picture = Base64.encode64 SecureRandom.alphanumeric(SecureRandom.random_number(10..200))
+          singer.save
+        end
+      end
+      puts "Updated #{singers.count} singers in one batch"
+    end
+  end
+end
+
+
+Application.run

data/examples/snippets/batch-dml/config/database.yml

@@ -0,0 +1,11 @@
+# Batch DML Example Configuration File
+# This file is used to configure the database connection for the batch DML example.
+development:
+  adapter: spanner
+  emulator_host: localhost:9010
+  project: test-project
+  instance: test-instance
+  database: testdb
+  pool: 5
+  timeout: 5000
+  schema_dump: false

data/examples/snippets/batch-dml/db/migrate/01_create_tables.rb

@@ -0,0 +1,23 @@
+# 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.
+
+class CreateTables < ActiveRecord::Migration[6.0]
+  def change
+    connection.ddl_batch do
+      create_table :singers do |t|
+        t.string :first_name
+        t.string :last_name
+        t.binary :picture
+      end
+
+      create_table :albums do |t|
+        t.string :title
+        t.numeric :marketing_budget
+        t.references :singer, index: false, foreign_key: true
+      end
+    end
+  end
+end

data/examples/snippets/batch-dml/db/seeds.rb

@@ -0,0 +1,8 @@
+# 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.
+
+# This file is intentionally kept empty, as this sample
+# does not need any initial data.