activerecord-spanner-adapter 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5132b6ef0337fa324c42c5b61ff6bee8e745352c58c46afc5f583a253fc6571
-  data.tar.gz: 699d2b993d739c78fc95fc12b30189e512517111aa9ae787d929b9d3ac828576
+  metadata.gz: 69f3ecf02a5d1f545a2a9a0182a768e9bad73c8223b54acdc38e38b9f5a639fb
+  data.tar.gz: 641d598c91a69eeb4af93fced37f9842334fb42d95378013711d9fa08ef10f88
 SHA512:
-  metadata.gz: 3d97e90c71f7dad83a35fc6cfb1921c24989d88b050c88b75ff444dbc58d4c0c2a9abbde2f8197d700dca121dda5c12853e4f6cae6c27bfc0520c7facbff3338
-  data.tar.gz: 5dbb5523a45941eff16db888d0af3c5ab7ea3e54af9e94d0f0943cef2a9b6d5e39078df1a1761e05a436910906cd19825f84f298d8e2b9043d79981dff51b4f7
+  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/cloud-sdk-ruby-team @olavloite @rahul2393 @ansh0l
+*     @googleapis/cloud-sdk-ruby-team @olavloite @rahul2393 @sakthivelmanii

data/.release-please-manifest.json

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

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

data/Gemfile

@@ -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/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/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.5.1".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.5.1
 platform: ruby
 authors:
 - Google LLC