activerecord-spanner-adapter 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f432fe0aba4f4aaa5d2bcc689d8337fb944b393a8f71e11731f21bd2bc1aad5
-  data.tar.gz: 3dd03abd67174f3b7239d2c19a18ae0df756ad009988ae8ecddbd2369eb7164b
+  metadata.gz: cfd752e3287084b088f8d8e7ba09d2644ec8bb3c5f699b80425ed7babc74ac1f
+  data.tar.gz: 2c72dad4930f696935f5a8ebe61db261da7ac11d3f8149b22f7bbe0bae900755
 SHA512:
-  metadata.gz: d99d549f841dcb2facf0438335b06449f70e033ad9c030fa2396fff16650e8a9ee653157ee8699cd9e473515630766e2f9b3e117acc73d6ddf35fb8ee83724a1
-  data.tar.gz: 4e207e65e60ab191c7479f7ae47c9fdd0ebac9a5ca54505841155428b88dc60c379dae96db6e43cd17e8c2bc2af9d9b7b5b4c5ae091281416cdf9d7616edaf9c
+  metadata.gz: 77e3afc2326448c8e7de3e838baf09d87beb631c28129c2588e14ae675cd20ea0bf4c18e89d2e1ec456fb519530dd9d968838fcfc2cab32d5dc66dd5fb586025
+  data.tar.gz: e4525d57eab407c0122a26ec412533e29e3ef51e942577a0686e36d22ddaf1a0243d30cc46ee350386b4ba292c9dc4a81dd7215e0beba5fc0eb08577f89a5ed1

data/.github/release-please.yml

@@ -0,0 +1,7 @@
+bumpMinorPreMajor: true
+handleGHRelease: true
+manifest: true
+monorepoTags: true
+packageName: activerecord-spanner-adapter
+primaryBranch: main
+releaseType: ruby-yoshi

data/.github/release-trigger.yml

@@ -0,0 +1 @@
+enabled: true

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

@@ -18,7 +18,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
         ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
@@ -26,6 +26,8 @@ jobs:
             ar: "~> 6.0.6"
           - ruby: "3.1"
             ar: "~> 6.0.6"
+          - ruby: "3.2"
+            ar: "~> 6.0.6"
           - ruby: "2.6"
             ar: "~> 7.0.4"
     env:

data/.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
         ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
@@ -18,6 +18,8 @@ jobs:
             ar: "~> 6.0.6"
           - ruby: "3.1"
             ar: "~> 6.0.6"
+          - ruby: "3.2"
+            ar: "~> 6.0.6"
           - ruby: "2.6"
             ar: "~> 7.0.4"
     env:

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

@@ -19,8 +19,8 @@ jobs:
       max-parallel: 4
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.6, 2.7, 3.0, 3.1]
-        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4]
+        ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
+        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
@@ -43,12 +43,24 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.1
             ar: 6.0.4
+          - ruby: 3.2
+            ar: 6.0.0
+          - ruby: 3.2
+            ar: 6.0.1
+          - ruby: 3.2
+            ar: 6.0.2.2
+          - ruby: 3.2
+            ar: 6.0.3.7
+          - ruby: 3.2
+            ar: 6.0.4
           - ruby: 2.6
             ar: 7.0.2.4
           - ruby: 2.6
             ar: 7.0.3.1
           - ruby: 2.6
             ar: 7.0.4
+          - ruby: 2.6
+            ar: 7.0.5
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -11,8 +11,8 @@ jobs:
       max-parallel: 4
       matrix:
         # Run unit tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.6, 2.7, 3.0, 3.1]
-        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4]
+        ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
+        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
@@ -35,12 +35,24 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.1
             ar: 6.0.4
+          - ruby: 3.2
+            ar: 6.0.0
+          - ruby: 3.2
+            ar: 6.0.1
+          - ruby: 3.2
+            ar: 6.0.2.2
+          - ruby: 3.2
+            ar: 6.0.3.7
+          - ruby: 3.2
+            ar: 6.0.4
           - ruby: 2.6
             ar: 7.0.2.4
           - ruby: 2.6
             ar: 7.0.3.1
           - ruby: 2.6
             ar: 7.0.4
+          - ruby: 2.6
+            ar: 7.0.5
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/release-please.yml

@@ -1,7 +1,5 @@
 name: Release-Please
 on:
-  schedule:
-    - cron: '57 10 * * *'
   workflow_dispatch:
     inputs:
       gem:

data/.kokoro/release.cfg

@@ -31,3 +31,12 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,docuploader_service_account"
 }
+
+# Store the packages uploaded to rubygems.org, which
+# we can later use to generate SBOMs and attestations.
+action {
+ define_artifacts {
+   regex: "github/ruby-spanner-activerecord/pkg/*.gem"
+   strip_prefix: "github"
+ }
+}

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.4.1"
+  ".": "1.4.2"
 }

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 1.4.2 (2023-06-01)
+
+#### Bug Fixes
+
+* allow functions to be default values ([#252](https://github.com/googleapis/ruby-spanner-activerecord/issues/252)) 
+* use original types for composite primary keys ([#246](https://github.com/googleapis/ruby-spanner-activerecord/issues/246)) 
+
 ### 1.4.1 (2023-03-01)
 
 #### Bug Fixes

data/CONTRIBUTING.md

@@ -48,10 +48,26 @@ Variable|Description|Comment
 `activerecord_tests`
 
 #### Example
+
 ```shell
 bundle exec rake acceptance[appdev-soda-spanner-staging,/home/Downloads/creds.json,activerecord_tests]
 ```
 
+You can also use the [Cloud Spanner emulator](https://cloud.google.com/spanner/docs/emulator).
+
+```shell
+docker run -d --rm -p 9010:9010 gcr.io/cloud-spanner-emulator/emulator
+export SPANNER_EMULATOR_HOST=localhost:9010
+bundle exec rake "acceptance[dummy-project,,dummy-instance,]"
+```
+
+If you want to run only one test, you can specify a test file.
+
+```shell
+bundle exec rake "acceptance[dummy-project,,dummy-instance,]" \
+  TEST=acceptance/cases/models/default_value_test.rb
+```
+
 ## Coding Style
 
 Please follow the established coding style in the library. The style is is
@@ -76,4 +92,4 @@ The rubocop settings depend on [googleapis/ruby-style](https://github.com/google
 
 Please note that this project is released with a Contributor Code of Conduct. By
 participating in this project you agree to abide by its terms. See
-{file:CODE_OF_CONDUCT.md Code of Conduct} for more information.
+{file:CODE_OF_CONDUCT.md Code of Conduct} for more information.

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.6.1")
-gem "minitest", "~> 5.16.3"
+gem "minitest", "~> 5.18.0"
 gem "pry", "~> 0.13.0"
 gem "pry-byebug", "~> 3.9.0"
 

data/acceptance/cases/migration/change_table_test.rb

@@ -86,7 +86,7 @@ module ActiveRecord
 
       def test_index_exists
         with_change_table do |t|
-          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3")
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3") && ActiveRecord::gem_version <= Gem::Version.create('7.0.4')
             @connection.expect :index_exists?, nil, [:delete_me, :bar, {}]
             t.index_exists?(:bar, {})
           else
@@ -98,7 +98,7 @@ module ActiveRecord
 
       def test_index_exists_with_options
         with_change_table do |t|
-          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3")
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3") && ActiveRecord::gem_version <= Gem::Version.create('7.0.4')
             @connection.expect :index_exists?, nil, [:delete_me, :bar, {unique: true}]
             t.index_exists?(:bar, {unique: true})
           else

data/acceptance/cases/models/default_value_test.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "test_helpers/with_separate_database"
+
+module Models
+  class DefaultValueTest < SpannerAdapter::TestCase
+    include TestHelpers::WithSeparateDatabase
+
+    class DynamicItem < ActiveRecord::Base; end
+
+    def test_dynamic_default_values
+      connection.create_table :dynamic_items do |t|
+        t.column :col_timestamp, :datetime, default: -> { "CURRENT_TIMESTAMP()" }
+      end
+
+      item = DynamicItem.create!
+      item.reload
+      assert(item.col_timestamp)
+    end
+  end
+end

data/acceptance/cases/models/interleave_test.rb

@@ -7,29 +7,100 @@
 # frozen_string_literal: true
 
 require "test_helper"
-require "models/singer"
-require "models/album_partial_disabled"
+require "test_helpers/with_separate_database"
 
 module ActiveRecord
   module Model
-    class InterleaveTest < SpannerAdapter::TestCase
-      include SpannerAdapter::Associations::TestHelper
+    class InterleaveTest
+      class WithPartialInsertsDisabledTest < SpannerAdapter::TestCase
+        include SpannerAdapter::Associations::TestHelper
 
-      attr_accessor :singer
+        class Singer < ActiveRecord::Base
+          has_many :albums, foreign_key: :singerid, dependent: :delete_all
+          has_many :tracks, foreign_key: :singerid
+        end
 
-      def setup
-        super
+        class Album < ActiveRecord::Base
+          self.primary_keys = :singerid, :albumid
 
-        @singer = Singer.create first_name: "FirstName", last_name: "LastName"
-      end
+          belongs_to :singer, foreign_key: :singerid
+
+          if ActiveRecord::VERSION::MAJOR >= 7
+            self.partial_inserts = false
+          end
+        end
+
+        attr_accessor :singer
+
+        def setup
+          super
 
-      def teardown
-        Album.destroy_all
-        Singer.destroy_all
+          @singer = Singer.create first_name: "FirstName", last_name: "LastName"
+        end
+
+        def teardown
+          Album.destroy_all
+          Singer.destroy_all
+        end
+
+        def test_with_partial_inserts_disabled
+          Album.create! title: "Title3", singer: singer
+        end
       end
 
-      def test_with_partial_inserts_disabled
-        AlbumPartialDisabled.create! title: "Title3", singer: singer
+      class StringParentKeyTest < SpannerAdapter::TestCase
+        include TestHelpers::WithSeparateDatabase
+
+        class Singer < ActiveRecord::Base
+          has_many :albums, foreign_key: :singer_id
+        end
+
+        class Album < ActiveRecord::Base
+          self.primary_keys = [:singer_id, :album_id]
+          belongs_to :singer, foreign_key: :singer_id
+        end
+
+        def setup
+          super
+
+          connection.ddl_batch do
+            connection.create_table :singers, id: false do |t|
+              t.string :singer_id, limit: 36, primary_key: true, null: false
+              t.string :name, null: false
+            end
+
+            connection.create_table :albums, id: false do |t|
+              t.interleave_in :singers
+              t.string :singer_id, limit: 36, parent_key: true, primary_key: true, null: false
+              t.integer :album_id, primary_key: true, null: false
+              t.string :title, null: false
+            end
+          end
+
+          @singer = Singer.create!(id: SecureRandom.uuid, name: "a singer")
+        end
+
+        def test_create_album
+          Album.create!(singer: @singer, title: "an album")
+        end
+
+        def test_update_album
+          album = Album.create!(singer: @singer, title: "an album")
+          album.update!(title: "an album 2")
+        end
+
+        def test_get_album
+          album = Album.create!(singer: @singer, title: "an album")
+          got_album = Album.find([@singer.singer_id, album.album_id])
+          assert_equal(album, got_album)
+        end
+
+        def test_get_albums_as_children
+          album1 = Album.create!(singer: @singer, title: "album1")
+          album2 = Album.create!(singer: @singer, title: "album2")
+          albums = @singer.albums.order(:title)
+          assert_equal([album1, album2], albums)
+        end
       end
     end
   end

data/acceptance/models/album.rb

@@ -4,8 +4,6 @@
 # license that can be found in the LICENSE file or at
 # https://opensource.org/licenses/MIT.
 
-require "composite_primary_keys"
-
 class Album < ActiveRecord::Base
   # Register both primary key columns with composite_primary_keys
   self.primary_keys = :singerid, :albumid

data/acceptance/test_helper.rb

@@ -15,6 +15,7 @@ require "active_support/testing/stream"
 require "activerecord-spanner-adapter"
 require "active_record/connection_adapters/spanner_adapter"
 require "securerandom"
+require "composite_primary_keys"
 
 # rubocop:disable Style/GlobalVars
 

data/acceptance/test_helpers/with_separate_database.rb

@@ -0,0 +1,47 @@
+# Copyright 2023 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 "securerandom"
+
+require "active_record/tasks/spanner_database_tasks"
+
+module TestHelpers
+  module WithSeparateDatabase
+    attr_reader :connection
+
+    def setup
+      spanner_adapter_connection.create_database
+      ActiveRecord::Base.establish_connection connection_config
+      @connection = ActiveRecord::Base.connection
+    end
+
+    def teardown
+      spanner_adapter_connection.database.drop
+    end
+
+    def connection_config
+      {
+        "adapter" => "spanner",
+        "emulator_host" => ENV["SPANNER_EMULATOR_HOST"],
+        "project" => ENV["SPANNER_TEST_PROJECT"],
+        "instance" => ENV["SPANNER_TEST_INSTANCE"],
+        "credentials" => ENV["SPANNER_TEST_KEYFILE"],
+        "database" => database_id,
+      }
+    end
+
+    def database_id
+      @database_id ||= "ar-test-#{SecureRandom.hex 4}"
+    end
+
+    def spanner_adapter_connection
+      @spanner_adapter_connection ||=
+        ActiveRecordSpannerAdapter::Connection.new(
+          connection_config.symbolize_keys
+        )
+    end
+  end
+end

data/lib/activerecord_spanner_adapter/base.rb

@@ -148,8 +148,10 @@ module ActiveRecord
 
     def self._set_composite_primary_key_value primary_key, values
       value = values[primary_key]
+      type = ActiveModel::Type::BigInteger.new
 
       if value.is_a? ActiveModel::Attribute
+        type = value.type
         value = value.value
       end
 
@@ -161,8 +163,7 @@ module ActiveRecord
 
       values[primary_key] =
         if ActiveRecord::VERSION::MAJOR >= 7
-          ActiveModel::Attribute.from_database primary_key, value,
-                                               ActiveModel::Type::BigInteger.new
+          ActiveModel::Attribute.from_database primary_key, value, type
         else
           value
         end

data/lib/activerecord_spanner_adapter/information_schema.rb

@@ -79,6 +79,14 @@ module ActiveRecordSpannerAdapter
         column_name = row["COLUMN_NAME"]
         options = column_options[column_name]
 
+        default = row["COLUMN_DEFAULT"]
+        default_function = row["GENERATION_EXPRESSION"]
+
+        if /\w+\(.*\)/.match?(default)
+          default_function ||= default
+          default = nil
+        end
+
         Table::Column.new \
           table_name,
           column_name,
@@ -87,8 +95,8 @@ module ActiveRecordSpannerAdapter
           allow_commit_timestamp: options["allow_commit_timestamp"],
           ordinal_position: row["ORDINAL_POSITION"],
           nullable: row["IS_NULLABLE"] == "YES",
-          default: row["COLUMN_DEFAULT"],
-          default_function: row["GENERATION_EXPRESSION"],
+          default: default,
+          default_function: default_function,
           generated: row["GENERATION_EXPRESSION"].present?
       end
     end

data/lib/activerecord_spanner_adapter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner
@@ -221,6 +221,8 @@ extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/blunderbuss.yml"
+- ".github/release-please.yml"
+- ".github/release-trigger.yml"
 - ".github/sync-repo-settings.yaml"
 - ".github/workflows/acceptance-tests-on-emulator.yaml"
 - ".github/workflows/acceptance-tests-on-production.yaml"
@@ -270,6 +272,7 @@ files:
 - acceptance/cases/migration/rename_column_test.rb
 - acceptance/cases/migration/schema_dumper_test.rb
 - acceptance/cases/models/calculation_query_test.rb
+- acceptance/cases/models/default_value_test.rb
 - acceptance/cases/models/generated_column_test.rb
 - acceptance/cases/models/insert_all_test.rb
 - acceptance/cases/models/interleave_test.rb
@@ -296,7 +299,6 @@ files:
 - acceptance/models/account.rb
 - acceptance/models/address.rb
 - acceptance/models/album.rb
-- acceptance/models/album_partial_disabled.rb
 - acceptance/models/all_types.rb
 - acceptance/models/author.rb
 - acceptance/models/club.rb
@@ -314,6 +316,7 @@ files:
 - acceptance/models/transaction.rb
 - acceptance/schema/schema.rb
 - acceptance/test_helper.rb
+- acceptance/test_helpers/with_separate_database.rb
 - activerecord-spanner-adapter.gemspec
 - assets/solidus-db.png
 - benchmarks/README.md

data/acceptance/models/album_partial_disabled.rb

@@ -1,17 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Use of this source code is governed by an MIT-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-
-# frozen_string_literal: true
-
-require "models/album"
-
-class AlbumPartialDisabled < Album
-  self.table_name = :albums
-
-  if ActiveRecord::VERSION::MAJOR >= 7
-    self.partial_inserts = false
-  end
-end