activerecord-spanner-adapter 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5132b6ef0337fa324c42c5b61ff6bee8e745352c58c46afc5f583a253fc6571
-  data.tar.gz: 699d2b993d739c78fc95fc12b30189e512517111aa9ae787d929b9d3ac828576
+  metadata.gz: 95f5439f841462a7fb1d4be2eac6333fb9e67ddc9038002ca15d04a6a8845f87
+  data.tar.gz: e713c475fc1cc4fbd056fcd4197613d79ab739fd27aa0fd22618e3871dfd0e45
 SHA512:
-  metadata.gz: 3d97e90c71f7dad83a35fc6cfb1921c24989d88b050c88b75ff444dbc58d4c0c2a9abbde2f8197d700dca121dda5c12853e4f6cae6c27bfc0520c7facbff3338
-  data.tar.gz: 5dbb5523a45941eff16db888d0af3c5ab7ea3e54af9e94d0f0943cef2a9b6d5e39078df1a1761e05a436910906cd19825f84f298d8e2b9043d79981dff51b4f7
+  metadata.gz: c3181723a9aec9fe057bf22fd454509dae392e95545b189a2177a53dd24b2e05f1e59f19d9e4e83d553843d05f86a86d037bc69cc3fb1c3614b7fd75c328afe0
+  data.tar.gz: 10ed060f43d6454a0f249235861787889c93e87722d70b0a89b559ce6650ad5b9ab27aa1b828b49cc43e0d22e076dc892cae42563d9f0f6b8f807b45422246cd

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/cloud-sdk-ruby-team @olavloite @rahul2393 @ansh0l
+*     @googleapis/cloud-sdk-ruby-team @olavloite @rahul2393 @sakthivelmanii

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

@@ -1,16 +1,20 @@
+name: acceptance tests on emulator
+
+permissions:
+  contents: read
+
 on:
   push:
     branches:
       - main
   pull_request:
-name: acceptance tests on emulator
 jobs:
   test:
     runs-on: ubuntu-latest
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.55
         ports:
           - 9010:9010
           - 9020:9020
@@ -18,28 +22,32 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.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"
             ar: "~> 7.1.0"
           - ruby: "3.4"
             ar: "~> 7.2.0"
+          - ruby: "4.0"
+            ar: "~> 7.0.0"
+          - ruby: "4.0"
+            ar: "~> 7.1.0"
+          - ruby: "4.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - 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):
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}

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

@@ -1,9 +1,13 @@
+name: acceptance tests on production
+
+permissions:
+  contents: read
+
 on:
   push:
     branches:
       - main
   pull_request:
-name: acceptance tests on production
 jobs:
   check-env:
     outputs:
@@ -26,20 +30,22 @@ jobs:
       matrix:
         ruby: [3.3]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - 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):
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - name: Authenticate Google Cloud
-      uses: google-github-actions/auth@v3
+      uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
       with:
         credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v3
+      uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
     - name: Install dependencies

data/.github/workflows/ci.yaml

@@ -1,37 +1,45 @@
+name: ci
+
+permissions:
+  contents: read
+
 on:
   push:
     branches:
       - main
   pull_request:
-name: ci
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.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"
             ar: "~> 7.1.0"
           - ruby: "3.4"
             ar: "~> 7.2.0"
+          - ruby: "4.0"
+            ar: "~> 7.0.0"
+          - ruby: "4.0"
+            ar: "~> 7.1.0"
+          - ruby: "4.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - 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):
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}

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

@@ -1,16 +1,20 @@
+name: nightly acceptance tests on emulator
+
+permissions:
+  contents: read
+
 on:
   schedule:
     # 06:00 UTC
     - cron:  '0 6 * * *'
   workflow_dispatch:
-name: nightly acceptance tests on emulator
 jobs:
   test:
     runs-on: ubuntu-latest
 
     services:
       emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.55
         ports:
           - 9010:9010
           - 9020:9020
@@ -18,26 +22,30 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.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"
             ar: "~> 7.1.0"
           - ruby: "3.4"
             ar: "~> 7.2.0"
+          - ruby: "4.0"
+            ar: "~> 7.0.0"
+          - ruby: "4.0"
+            ar: "~> 7.1.0"
+          - ruby: "4.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         # Disable caching as we are overriding the ActiveRecord below.
         bundler-cache: false

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

@@ -1,8 +1,12 @@
+name: nightly acceptance tests on production
+
+permissions:
+  contents: read
+
 on:
   schedule:
     # 02:00 UTC
     - cron:  '0 2 * * *'
-name: nightly acceptance tests on production
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -12,20 +16,22 @@ jobs:
       matrix:
         ruby: [3.3]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - 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):
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - name: Authenticate Google Cloud
-      uses: google-github-actions/auth@v3
+      uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
       with:
         credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v3
+      uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
     - name: Install dependencies

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

@@ -1,9 +1,13 @@
+name: nightly-unit-tests
+
+permissions:
+  contents: read
+
 on:
   schedule:
     # 05:30 UTC
     - cron:  '30 5 * * *'
   workflow_dispatch:
-name: nightly-unit-tests
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -11,26 +15,30 @@ jobs:
       max-parallel: 4
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.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"
             ar: "~> 7.1.0"
           - ruby: "3.4"
             ar: "~> 7.2.0"
+          - ruby: "4.0"
+            ar: "~> 7.0.0"
+          - ruby: "4.0"
+            ar: "~> 7.1.0"
+          - ruby: "4.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         # Disable caching as we are overriding the ActiveRecord below.
         bundler-cache: false

data/.github/workflows/rubocop.yaml

@@ -1,5 +1,8 @@
 name: rubocop
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     types: [opened, synchronize]
@@ -12,13 +15,15 @@ jobs:
     timeout-minutes: 10
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - name: setup ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
-        ruby-version: '3.4.8'
+        ruby-version: '4.0.5'
     - name: cache gems
-      uses: actions/cache@v5
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}

data/.github/workflows/samples.yaml

@@ -1,6 +1,10 @@
+name: samples
+
+permissions:
+  contents: read
+
 on:
   pull_request:
-name: samples
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -8,24 +12,30 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
         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"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"
             ar: "~> 7.1.0"
           - ruby: "3.4"
             ar: "~> 7.2.0"
+          - ruby: "4.0"
+            ar: "~> 7.0.0"
+          - ruby: "4.0"
+            ar: "~> 7.1.0"
+          - ruby: "4.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
       with:
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}

data/.release-please-manifest.json

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

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.6.0 (2026-07-09)
+
+#### Features
+
+* Ruby 3.2 minimum and Ruby 4.0 support ([#397](https://github.com/googleapis/ruby-spanner-activerecord/issues/397)) 
+
+### 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

data/Gemfile

@@ -10,7 +10,9 @@ gem "minitest", "~> 5.27.0"
 gem "minitest-rg", "~> 5.4.0"
 gem "pry", "~> 0.14.2"
 gem "pry-byebug", "~> 3.11.0"
+gem "readline"
 gem "mutex_m"
+gem "irb"
 # Add sqlite3 for testing for compatibility with other adapters.
 gem 'sqlite3'
 
@@ -22,3 +24,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

@@ -11,9 +11,9 @@ for Spanner PostgreSQL-dialect databases.__
 
 This project provides a Spanner adapter for ActiveRecord. It supports the following versions:
 
-- 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 7.0.x with Ruby 3.2 and higher.
+- ActiveRecord 7.1.x with Ruby 3.2 and higher.
+- ActiveRecord 7.2.x with Ruby 3.2 and higher.
 - ActiveRecord 8.0.x with Ruby 3.2 and higher.
 - ActiveRecord 8.1.x with Ruby 3.2 and higher.
 

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/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/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/activerecord-spanner-adapter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.add_dependency "google-cloud-spanner", "~> 2.25"
   spec.add_dependency "google-cloud-spanner-v1", "~> 1.7"
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
   spec.add_development_dependency "bundler", [">= 2.0", "< 5.0"]
-  spec.add_development_dependency "google-style", "~> 1.31.0"
+  spec.add_development_dependency "google-style", "~> 1.32.0"
   spec.add_development_dependency "minitest", "~> 5.10"
   spec.add_development_dependency "minitest-autotest", "~> 1.0"
   spec.add_development_dependency "minitest-focus", "~> 1.1"

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/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/activerecord_spanner_adapter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Google LLC
@@ -97,14 +97,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.32.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -597,7 +597,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="