activerecord-spanner-adapter 2.4.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb3f5f2106d42a64cf32616e119f188cc13a1b81acfa040765ae4b5cb2838cf1
-  data.tar.gz: 5ff65bbec67470ddc479f6ba985e9d31c0562848b9f0739e697ceb1d6715e3dc
+  metadata.gz: 69f3ecf02a5d1f545a2a9a0182a768e9bad73c8223b54acdc38e38b9f5a639fb
+  data.tar.gz: 641d598c91a69eeb4af93fced37f9842334fb42d95378013711d9fa08ef10f88
 SHA512:
-  metadata.gz: 939b508009ff79969637045e526dab1a73ed2f9b979fc6812447b2b98e673dce42e2d55bbf924fc6b372c35e481a374f8fc556c853b7861b8344735549ca3521
-  data.tar.gz: f9c2dc8d41a7748a12daa8e342ae020c5109f793f62f0d2c506842d7030cac9d9578e169e356728f80e7c590e0a48bfa75fd05c235b121c25c9858e84cd25463
+  metadata.gz: 951478249b5dc96f1dec3b9b1aa0b8764a361963e129283e5cb22ae391fc85d3572cf5a3056442c09a46732237524c89807aede0f0bb55b8c938c92b6a891475
+  data.tar.gz: 2d36a28118c79c5680227a8a7cba2ba3a07586168229151bbeae764ecf1ef36e70c6bb4327703d5835e18fa5b0093cfc9a49f6f2555ecb3ab670bbf2cda4cbda

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 @sakthivelmanii

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"

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"

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"

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"

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.4.0"
+  ".": "2.5.1"
 }

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+### 2.5.1 (2026-06-30)
+
+#### Bug Fixes
+
+* use DateTime instead of Time for time data type ([#395](https://github.com/googleapis/ruby-spanner-activerecord/issues/395)) 
+
+### 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

data/Gemfile

@@ -7,7 +7,7 @@ ar_version = ENV.fetch("AR_VERSION", "~> 7.1.0")
 gem "activerecord", ar_version
 gem "ostruct"
 gem "minitest", "~> 5.27.0"
-gem "minitest-rg", "~> 5.3.0"
+gem "minitest-rg", "~> 5.4.0"
 gem "pry", "~> 0.14.2"
 gem "pry-byebug", "~> 3.11.0"
 gem "mutex_m"
@@ -22,3 +22,8 @@ end
 # Required for samples
 gem "docker-api"
 gem "sinatra-activerecord"
+
+# Force google-protobuf to compile from source to avoid ABI issues in CI
+if ENV["CI"]
+  gem "google-protobuf", force_ruby_platform: true
+end

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/change_schema_test.rb

@@ -300,7 +300,7 @@ module ActiveRecord
 
         column = connection.columns(:testings).find { |c| c.name == "foo" }
 
-        assert_equal :time, column.type
+        assert_equal :datetime, column.type
         assert_equal "TIMESTAMP", column.sql_type
       end
 

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/migration/schema_dumper_test.rb

@@ -76,7 +76,7 @@ module ActiveRecord
         connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
-        assert schema.string.include?("t.time \"last_updated\", allow_commit_timestamp: true"), schema.string
+        assert_match(/t\.(datetime|timestamp) "last_updated",.*allow_commit_timestamp: true/, schema.string, schema.string)
       end
 
       def test_dump_schema_contains_virtual_column

data/acceptance/cases/tasks/database_tasks_test.rb

@@ -129,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>,
@@ -138,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),
@@ -287,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>,
@@ -296,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),
@@ -463,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>,
@@ -472,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,
@@ -624,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>,
@@ -633,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/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/cases/type/time_test.rb

@@ -45,7 +45,7 @@ module ActiveRecord
       end
 
       def test_date_time_string_value_with_subsecond_precision
-        expected_time = ::Time.local 2017, 07, 4, 14, 19, 10, 897761
+        expected_time = ::Time.utc 2017, 7, 4, 14, 19, 10, 897761
 
         string_value = "2017-07-04 14:19:10.897761"
 
@@ -53,6 +53,7 @@ module ActiveRecord
         assert_equal expected_time, record.start_time.utc
 
         record.save!
+        record.reload
         assert_equal expected_time, record.start_time.utc
 
         assert_equal record, TestTypeModel.find_by(start_time: string_value)
@@ -60,12 +61,13 @@ module ActiveRecord
 
       def test_date_time_with_string_value_with_non_iso_format
         string_value = "04/07/2017 2:19pm"
-        expected_time = ::Time.local 2017, 07, 4, 14, 19
+        expected_time = ::Time.utc 2017, 7, 4, 14, 19
 
         record = TestTypeModel.new start_time: string_value
         assert_equal expected_time, record.start_time
 
         record.save!
+        record.reload
         assert_equal expected_time, record.start_time.utc
 
         assert_equal record, TestTypeModel.find_by(start_time: string_value)
@@ -82,6 +84,124 @@ module ActiveRecord
 
         assert_equal expected_time, record.start_time
       end
+
+      def test_multiparameter_datetime
+        expected_time = ::Time.utc 2020, 12, 25, 10, 30, 0
+        record = TestTypeModel.new start_time: { 1 => 2020, 2 => 12, 3 => 25, 4 => 10, 5 => 30 }
+
+        assert_equal expected_time, record.start_time
+
+        record.save!
+        record.reload
+
+        assert_equal expected_time, record.start_time
+      end
+
+      def test_date_time_string_value_with_timezone_aware_attributes
+        old_zone = ::Time.zone
+        ::Time.zone = "UTC"
+        TestTypeModel.time_zone_aware_attributes = true
+        TestTypeModel.reset_column_information
+
+        string_value = "2017-07-04 14:19:10.897761"
+        expected_time = ::Time.zone.local 2017, 7, 4, 14, 19, 10, 897761
+
+        record = TestTypeModel.new start_time: string_value
+        assert_equal expected_time, record.start_time
+
+        record.save!
+        record.reload
+        assert_equal expected_time, record.start_time
+
+        assert_equal record, TestTypeModel.find_by(start_time: string_value)
+      ensure
+        TestTypeModel.time_zone_aware_attributes = false
+        TestTypeModel.reset_column_information
+        ::Time.zone = old_zone
+      end
+
+      def test_string_value_with_paris_timezone
+        old_zone = ::Time.zone
+        ::Time.zone = "Paris" # Paris is UTC+2 in July (DST)
+        TestTypeModel.time_zone_aware_attributes = true
+        TestTypeModel.reset_column_information
+
+        begin
+          string_value = "2017-07-04 14:19:10.897761123"
+          # 14:19:10 in Paris (DST) is 12:19:10 UTC
+          # Subseconds: 897761123 nanoseconds = 897761.123 microseconds
+          expected_time = ::Time.zone.local(2017, 7, 4, 14, 19, 10, Rational(897761123, 1000))
+
+          record = TestTypeModel.new start_time: string_value
+          assert_equal expected_time, record.start_time
+          assert_equal 897761123, record.start_time.nsec
+          assert_instance_of ActiveSupport::TimeWithZone, record.start_time
+          assert_equal "Paris", record.start_time.time_zone.name
+
+          record.save!
+          
+          # Verify directly in the database using the raw Spanner client (bypasses ActiveRecord)
+          raw_client = Google::Cloud::Spanner.new(
+            project: connector_config["project"],
+            emulator_host: connector_config["emulator_host"]
+          )
+          db_client = raw_client.client(
+            connector_config["instance"],
+            connector_config["database"]
+          )
+          
+          results = db_client.execute "SELECT start_time FROM test_types WHERE id = #{record.id}"
+          raw_value = results.rows.first[:start_time]
+          
+          # Spanner client returns TIMESTAMP as a UTC Time object
+          expected_raw_time = ::Time.utc(2017, 7, 4, 12, 19, 10, Rational(897761123, 1000))
+          assert_equal expected_raw_time, raw_value
+          assert_equal 897761123, raw_value.nsec
+          assert_equal "UTC", raw_value.zone
+
+          record.reload
+
+          assert_equal expected_time, record.start_time
+          assert_equal 897761123, record.start_time.nsec
+          assert_instance_of ActiveSupport::TimeWithZone, record.start_time
+          assert_equal "Paris", record.start_time.time_zone.name
+        ensure
+          TestTypeModel.time_zone_aware_attributes = false
+          TestTypeModel.reset_column_information
+          ::Time.zone = old_zone
+        end
+      end
+
+      def test_string_value_with_utc_and_local_timezones
+        # 1. With 'Z' (UTC)
+        string_value_utc = "2017-07-04 14:19:10.897761123Z"
+        expected_time_utc = ::Time.utc 2017, 7, 4, 14, 19, 10, Rational(897761123, 1000)
+        record = TestTypeModel.new start_time: string_value_utc
+        assert_equal expected_time_utc, record.start_time
+        assert_equal 897761123, record.start_time.nsec
+
+        # 2. With Offset (+02:00)
+        string_value_offset = "2017-07-04 14:19:10.897761123+02:00"
+        # 14:19:10+02:00 is 12:19:10 UTC
+        expected_time_offset = ::Time.utc 2017, 7, 4, 12, 19, 10, Rational(897761123, 1000)
+        record = TestTypeModel.new start_time: string_value_offset
+        assert_equal expected_time_offset, record.start_time
+        assert_equal 897761123, record.start_time.nsec
+
+        # 3. Without offset, but with ActiveRecord.default_timezone = :local
+        old_default_timezone = ActiveRecord.default_timezone
+        ActiveRecord.default_timezone = :local
+        begin
+          string_value_no_offset = "2017-07-04 14:19:10.897761123"
+          # Should be interpreted as local time
+          expected_time_local = ::Time.local 2017, 7, 4, 14, 19, 10, Rational(897761123, 1000)
+          record = TestTypeModel.new start_time: string_value_no_offset
+          assert_equal expected_time_local, record.start_time
+          assert_equal 897761123, record.start_time.nsec
+        ensure
+          ActiveRecord.default_timezone = old_default_timezone
+        end
+      end
     end
   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/Rakefile

@@ -6,6 +6,7 @@
 
 require_relative "config/environment"
 require "docker"
+require "google/cloud/spanner"
 
 def fetch_samples
   Dir.entries(".").select do |entry|
@@ -50,6 +51,25 @@ task :run, [:sample] do |_t, args|
   run_sample sample
 end
 
+def wait_for_emulator
+  puts "Waiting for Spanner emulator to be ready..."
+  spanner = Google::Cloud::Spanner.new project: "test-project", emulator_host: "127.0.0.1:9010"
+  retries = 20
+  begin
+    # Make a cheap API call to verify the emulator is actually responding
+    spanner.instances
+    puts "Spanner emulator is ready."
+  rescue StandardError => e
+    if retries > 0
+      retries -= 1
+      sleep 0.5
+      retry
+    else
+      puts "Timed out waiting for Spanner emulator. Last error: #{e.message}"
+    end
+  end
+end
+
 def run_sample sample
   puts "Running #{sample}"
   puts "Downloading Spanner emulator image..."
@@ -68,6 +88,7 @@ def run_sample sample
   begin
     puts "Starting Spanner emulator..."
     container.start!
+    wait_for_emulator
     Dir.chdir sample do
       sh "ruby ../bin/create_emulator_instance.rb"
       sh "rake db:migrate"

data/lib/active_record/connection_adapters/spanner/column.rb

@@ -10,13 +10,26 @@ module ActiveRecord
   module ConnectionAdapters
     module Spanner
       class Column < ConnectionAdapters::Column
-        # rubocop:disable Style/OptionalBooleanParameter
-        def initialize(name, default, sql_type_metadata = nil, null = true,
-                       default_function = nil, collation: nil, comment: nil,
-                       primary_key: false, **)
-          # rubocop:enable Style/OptionalBooleanParameter
-          super
-          @primary_key = primary_key
+        VERSION_8_1 = Gem::Version.create "8.1.0"
+
+        if ActiveRecord.gem_version < VERSION_8_1
+          # rubocop:disable Style/OptionalBooleanParameter
+          def initialize(name, default, sql_type_metadata = nil, null = true,
+                         default_function = nil, collation: nil, comment: nil,
+                         primary_key: false, **)
+            # rubocop:enable Style/OptionalBooleanParameter
+            super
+            @primary_key = primary_key
+          end
+        else
+          # rubocop:disable Style/OptionalBooleanParameter
+          def initialize(name, cast_type, default, sql_type_metadata = nil, null = true,
+                         default_function = nil, collation: nil, comment: nil,
+                         primary_key: false, **)
+            # rubocop:enable Style/OptionalBooleanParameter
+            super
+            @primary_key = primary_key
+          end
         end
 
         def auto_incremented_by_db?

data/lib/active_record/connection_adapters/spanner/schema_creation.rb

@@ -138,7 +138,11 @@ module ActiveRecord
             sql << " NOT NULL"
           end
           if options.key? :default
-            sql << " DEFAULT (#{quote_default_expression options[:default], column})"
+            sql << if respond_to? :quote_default_expression_for_column_definition, :include_private
+                     " DEFAULT (#{quote_default_expression_for_column_definition options[:default], column})"
+                   else
+                     " DEFAULT (#{quote_default_expression options[:default], column})"
+                   end
           elsif column.type == :primary_key
             if @connection.use_auto_increment?
               sql << " AUTO_INCREMENT"

data/lib/active_record/connection_adapters/spanner/schema_statements.rb

@@ -22,6 +22,7 @@ module ActiveRecord
       #
       module SchemaStatements
         VERSION_7_2 = Gem::Version.create "7.2.0"
+        VERSION_8_1 = Gem::Version.create "8.1.0"
 
         def current_database
           @connection.database_id
@@ -116,18 +117,37 @@ module ActiveRecord
           information_schema { |i| i.table_columns table_name }
         end
 
-        def new_column_from_field _table_name, field, _definitions = nil
-          Spanner::Column.new \
-            field.name,
-            field.default,
-            fetch_type_metadata(field.spanner_type,
-                                field.ordinal_position,
-                                field.allow_commit_timestamp,
-                                field.generated,
-                                is_identity: field.is_identity),
-            field.nullable,
-            field.default_function,
-            primary_key: field.primary_key
+        if ActiveRecord.gem_version < VERSION_8_1
+          def new_column_from_field _table_name, field, _definitions = nil
+            Spanner::Column.new \
+              field.name,
+              field.default,
+              fetch_type_metadata(field.spanner_type,
+                                  field.ordinal_position,
+                                  field.allow_commit_timestamp,
+                                  field.generated,
+                                  is_identity: field.is_identity),
+              field.nullable,
+              field.default_function,
+              primary_key: field.primary_key
+          end
+        else
+          def new_column_from_field _table_name, field, _definitions = nil
+            cast_type = type_map.lookup field.type
+            raise ArgumentError, "unknown type: `#{field.type}`" if cast_type.nil?
+            Spanner::Column.new \
+              field.name,
+              cast_type,
+              field.default,
+              fetch_type_metadata(field.spanner_type,
+                                  field.ordinal_position,
+                                  field.allow_commit_timestamp,
+                                  field.generated,
+                                  is_identity: field.is_identity),
+              field.nullable,
+              field.default_function,
+              primary_key: field.primary_key
+          end
         end
 
         def fetch_type_metadata sql_type, ordinal_position = nil, allow_commit_timestamp = nil, generated = nil,

data/lib/active_record/connection_adapters/spanner/type_mapping.rb

@@ -0,0 +1,26 @@
+# Copyright 2026 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
+
+NATIVE_DATABASE_TYPES = {
+  primary_key:  "INT64",
+  parent_key:   "INT64",
+  string:       { name: "STRING", limit: "MAX" },
+  text:         { name: "STRING", limit: "MAX" },
+  integer:      { name: "INT64" },
+  bigint:       { name: "INT64" },
+  float:        { name: "FLOAT64" },
+  decimal:      { name: "NUMERIC" },
+  numeric:      { name: "NUMERIC" },
+  datetime:     { name: "TIMESTAMP" },
+  time:         { name: "TIMESTAMP" },
+  date:         { name: "DATE" },
+  binary:       { name: "BYTES", limit: "MAX" },
+  boolean:      { name: "BOOL" },
+  json:         { name: "JSON" },
+  uuid:         { name: "UUID" }
+}.freeze

data/lib/active_record/connection_adapters/spanner_adapter.rb

@@ -13,12 +13,14 @@ require "active_record/connection_adapters/spanner/database_statements"
 require "active_record/connection_adapters/spanner/schema_statements"
 require "active_record/connection_adapters/spanner/schema_cache"
 require "active_record/connection_adapters/spanner/schema_definitions"
+require "active_record/connection_adapters/spanner/type_mapping"
 require "active_record/connection_adapters/spanner/type_metadata"
 require "active_record/connection_adapters/spanner/quoting"
 require "active_record/type/spanner/array"
 require "active_record/type/spanner/bytes"
 require "active_record/type/spanner/spanner_active_record_converter"
 require "active_record/type/spanner/time"
+require "active_record/type/spanner/uuid"
 require "arel/visitors/spanner"
 require "activerecord_spanner_adapter/base"
 require "activerecord_spanner_adapter/connection"
@@ -46,23 +48,6 @@ module ActiveRecord
   module ConnectionAdapters
     class SpannerAdapter < AbstractAdapter
       ADAPTER_NAME = "spanner".freeze
-      NATIVE_DATABASE_TYPES = {
-        primary_key:  "INT64",
-        parent_key:   "INT64",
-        string:       { name: "STRING", limit: "MAX" },
-        text:         { name: "STRING", limit: "MAX" },
-        integer:      { name: "INT64" },
-        bigint:       { name: "INT64" },
-        float:        { name: "FLOAT64" },
-        decimal:      { name: "NUMERIC" },
-        numeric:      { name: "NUMERIC" },
-        datetime:     { name: "TIMESTAMP" },
-        time:         { name: "TIMESTAMP" },
-        date:         { name: "DATE" },
-        binary:       { name: "BYTES", limit: "MAX" },
-        boolean:      { name: "BOOL" },
-        json:         { name: "JSON" }
-      }.freeze
 
       include Spanner::Quoting
       include Spanner::DatabaseStatements
@@ -118,6 +103,10 @@ module ActiveRecord
         NATIVE_DATABASE_TYPES
       end
 
+      def self.native_database_types
+        NATIVE_DATABASE_TYPES
+      end
+
       # Database
 
       def self.database_exists? config
@@ -262,6 +251,7 @@ module ActiveRecord
           register_class_with_limit m, %r{^STRING}i, Type::String
           m.register_type "TIMESTAMP", ActiveRecord::Type::Spanner::Time.new
           m.register_type "JSON", ActiveRecord::Type::Json.new
+          m.register_type "UUID", ActiveRecord::Type::Spanner::Uuid.new
 
           register_array_types m
         end
@@ -277,6 +267,7 @@ module ActiveRecord
           m.register_type %r{^ARRAY<STRING\((MAX|d+)\)>}i, Type::Spanner::Array.new(Type::String.new)
           m.register_type %r{^ARRAY<TIMESTAMP>}i, Type::Spanner::Array.new(ActiveRecord::Type::Spanner::Time.new)
           m.register_type %r{^ARRAY<JSON>}i, Type::Spanner::Array.new(ActiveRecord::Type::Json.new)
+          m.register_type %r{^ARRAY<UUID>}i, Type::Spanner::Array.new(ActiveRecord::Type::Spanner::Uuid.new)
         end
 
         def extract_limit sql_type

data/lib/active_record/type/spanner/spanner_active_record_converter.rb

@@ -37,6 +37,7 @@ module ActiveRecord
           when ActiveModel::Type::DateTime, ActiveModel::Type::Time, ActiveRecord::Type::Spanner::Time then :TIMESTAMP
           when ActiveModel::Type::Date then :DATE
           when ActiveRecord::Type::Json then :JSON
+          when ActiveRecord::Type::Spanner::Uuid then :UUID
           when ActiveRecord::Type::Spanner::Array then [convert_active_model_type_to_spanner(type.element_type)]
           end
         end

data/lib/active_record/type/spanner/time.rb

@@ -9,7 +9,24 @@
 module ActiveRecord
   module Type
     module Spanner
-      class Time < ActiveRecord::Type::Time
+      class Time < ActiveRecord::Type::DateTime
+        def cast_value value
+          if value.is_a? ::String
+            return if value.empty?
+            begin
+              if ActiveRecord.default_timezone == :utc
+                ::DateTime.parse(value).to_time.getutc
+              else
+                ::Time.parse(value).getlocal
+              end
+            rescue StandardError
+              super
+            end
+          else
+            super
+          end
+        end
+
         def serialize_with_isolation_level value, isolation_level
           if value == :commit_timestamp
             return "PENDING_COMMIT_TIMESTAMP()" if isolation_level == :dml
@@ -24,18 +41,14 @@ module ActiveRecord
           val.acts_like?(:time) ? val.utc.rfc3339(9) : val
         end
 
-        def user_input_in_time_zone value
-          return value.in_time_zone if value.is_a? ::Time
-          super value
+        def value_from_multiparameter_assignment values
+          defaults = { 1 => 2000, 2 => 1, 3 => 1 }
+          super defaults.merge(values)
         end
 
         private
 
-        def cast_value value
-          if value.is_a? ::String
-            value = value.empty? ? nil : ::Time.parse(value)
-          end
-
+        def apply_seconds_precision value
           value
         end
       end

data/lib/active_record/type/spanner/uuid.rb

@@ -0,0 +1,19 @@
+# Copyright 2026 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
+
+module ActiveRecord
+  module Type
+    module Spanner
+      class Uuid < ActiveModel::Type::Value
+        def type
+          :uuid
+        end
+      end
+    end
+  end
+end

data/lib/activerecord_spanner_adapter/connection.rb

@@ -6,6 +6,7 @@
 
 require "google/cloud/spanner"
 require "spanner_client_ext"
+require "active_record/connection_adapters/spanner/type_mapping"
 require "activerecord_spanner_adapter/information_schema"
 require_relative "../active_record/connection_adapters/spanner/errors/transaction_mutation_limit_exceeded_error"
 
@@ -43,6 +44,10 @@ module ActiveRecordSpannerAdapter
       end
     end
 
+    def native_database_types
+      NATIVE_DATABASE_TYPES
+    end
+
     # Clears the cached information about the underlying information schemas.
     # Call this method if you drop and recreate a database with the same name
     # to prevent the cached information to be used for the new database.

data/lib/activerecord_spanner_adapter/version.rb

@@ -5,5 +5,5 @@
 # https://opensource.org/licenses/MIT.
 
 module ActiveRecordSpannerAdapter
-  VERSION = "2.4.0".freeze
+  VERSION = "2.5.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Google LLC
@@ -75,16 +75,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -553,6 +559,7 @@ files:
 - lib/active_record/connection_adapters/spanner/schema_definitions.rb
 - lib/active_record/connection_adapters/spanner/schema_dumper.rb
 - lib/active_record/connection_adapters/spanner/schema_statements.rb
+- lib/active_record/connection_adapters/spanner/type_mapping.rb
 - lib/active_record/connection_adapters/spanner/type_metadata.rb
 - lib/active_record/connection_adapters/spanner_adapter.rb
 - lib/active_record/tasks/spanner_database_tasks.rb
@@ -560,6 +567,7 @@ files:
 - lib/active_record/type/spanner/bytes.rb
 - lib/active_record/type/spanner/spanner_active_record_converter.rb
 - lib/active_record/type/spanner/time.rb
+- lib/active_record/type/spanner/uuid.rb
 - lib/activerecord-spanner-adapter.rb
 - lib/activerecord_spanner_adapter/base.rb
 - lib/activerecord_spanner_adapter/connection.rb