activerecord-spanner-adapter 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcc2624f18893422bf8ac9c23d07fff039e79cee5f51b975054314f49820b694
-  data.tar.gz: 7145b48f67236eb7ee9aac20bd1dfa907268419f262abf82cd6973acba25ab64
+  metadata.gz: 9a2ada6b62b88752f24052c1071bb3df30e1057e711045d26ecf1403b891d5b7
+  data.tar.gz: 831ec65b5bb4b25ce13970213a5f626e327d9ab6972f86f21076363218fc3ef7
 SHA512:
-  metadata.gz: 49aed5257b191aee1e9271c1d04e91c2ff1663c78e9b1e70e89acda430587324991a10cb1b2aabdfd9b1e9d70ab862b3a1579fda5c032023175303fa260deeed
-  data.tar.gz: 1764369d2a370d4c8d35cbbcd3b9c45130514cc6e76bac67e5a9dafbf2bf020734b973be44f354b13da9acaaffdebaba78e31046da56c6e62efe0546aca30611
+  metadata.gz: 781bb93f7a9d505864b7b242088b51921df1386c4859e112057bd8b1d3c7bcbee1e3f941af2bcf99324537c136b667464c6328630aa6bd7a769fb9ee52ace690
+  data.tar.gz: 485369ec08bd2d3dac01edb57425dd003cace09581bf01fd4d7300a1d4142bc8a701a4d83f18b56c740c7b52f9d2c58d7af0eb3683bafb3e4e81afc59e2e2dc5

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

@@ -19,13 +19,17 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: [2.6, 2.7, 3.0]
-        ar: [6.0.4, 6.1.4]
-        # Exclude Ruby 3.0 and ActiveRecord 6.0.x as that combination is not supported.
+        ar: [6.0.4, 6.1.4, 7.0.2.4]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.4
+          - ruby: 2.6
+            ar: 7.0.2.4
+    env:
+      AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - 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):
@@ -33,8 +37,6 @@ jobs:
       with:
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}
-    - name: Set ActiveRecord version
-      run: sed -i "s/\"activerecord\", \"~> 6.1.4\"/\"activerecord\", \"${{ matrix.ar }}\"/" activerecord-spanner-adapter.gemspec
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on emulator

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

@@ -26,7 +26,7 @@ jobs:
       matrix:
         ruby: [3.0]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):

data/.github/workflows/ci.yaml

@@ -11,13 +11,17 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: [2.6, 2.7, 3.0]
-        ar: [6.0.4, 6.1.4]
-        # Exclude Ruby 3.0 and ActiveRecord 6.0.x as that combination is not supported.
+        ar: [6.0.4, 6.1.4, 7.0.2.4]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.4
+          - ruby: 2.6
+            ar: 7.0.2.4
+    env:
+      AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - 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):
@@ -25,8 +29,6 @@ jobs:
       with:
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}
-    - name: Set ActiveRecord version
-      run: sed -i "s/\"activerecord\", \"~> 6.1.4\"/\"activerecord\", \"${{ matrix.ar }}\"/" activerecord-spanner-adapter.gemspec
     - name: Install dependencies
       run: bundle install
     - name: Run tests

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

@@ -19,8 +19,8 @@ jobs:
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
         ruby: [2.5, 2.6, 2.7, 3.0]
-        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.0, 6.1.1, 6.1.2.1, 6.1.3.2, 6.1.4]
-        # Exclude Ruby 3.0 and ActiveRecord 6.0.x as that combination is not supported.
+        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.0, 6.1.1, 6.1.2.1, 6.1.3.2, 6.1.4, 7.0.2.4]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.0
@@ -32,16 +32,20 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.0
             ar: 6.0.4
+          - ruby: 2.5
+            ar: 7.0.2.4
+          - ruby: 2.6
+            ar: 7.0.2.4
+    env:
+      AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         # Disable caching as we are overriding the ActiveRecord below.
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}
-    - name: Set ActiveRecord version
-      run: sed -i "s/\"activerecord\", \"~> 6.1.4\"/\"activerecord\", \"${{ matrix.ar }}\"/" activerecord-spanner-adapter.gemspec
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on emulator

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

@@ -12,7 +12,7 @@ jobs:
       matrix:
         ruby: [3.0]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby
     # (see https://github.com/ruby/setup-ruby#versioning):
@@ -21,7 +21,7 @@ jobs:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@master
+      uses: google-github-actions/setup-gcloud@v0
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
         service_account_key: ${{ secrets.GCP_SA_KEY }}

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

@@ -11,8 +11,8 @@ jobs:
       matrix:
         # Run unit tests all supported combinations of Ruby and ActiveRecord.
         ruby: [2.5, 2.6, 2.7, 3.0]
-        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.0, 6.1.1, 6.1.2.1, 6.1.3.2, 6.1.4]
-        # Exclude Ruby 3.0 and ActiveRecord 6.0.x as that combination is not supported.
+        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.0, 6.1.1, 6.1.2.1, 6.1.3.2, 6.1.4, 7.0.2.4]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.0
@@ -24,16 +24,20 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.0
             ar: 6.0.4
+          - ruby: 2.5
+            ar: 7.0.2.4
+          - ruby: 2.6
+            ar: 7.0.2.4
+    env:
+      AR_VERSION: ${{ matrix.ar }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         # Disable caching as we are overriding the ActiveRecord below.
         bundler-cache: false
         ruby-version: ${{ matrix.ruby }}
-    - name: Set ActiveRecord version
-      run: sed -i "s/\"activerecord\", \"~> 6.1.4\"/\"activerecord\", \"${{ matrix.ar }}\"/" activerecord-spanner-adapter.gemspec
     - name: Install dependencies
       run: bundle install
     - name: Run tests

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

@@ -20,13 +20,13 @@ jobs:
       RELEASE_PLEASE_DISABLE: ${{ secrets.RELEASE_PLEASE_DISABLE }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.0"
       - name: Install NodeJS 16.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "16.x"
       - name: Install tools

data/.github/workflows/rubocop.yaml

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

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.0.1"
+  ".": "1.1.0"
 }

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.1.0 (2022-06-24)
+
+#### Features
+
+* Support insert_all and upsert_all with DML and mutations
+
 ### 1.0.1 (2022-04-21)
 
 #### Bug Fixes

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-spanner.gemspec
 gemspec
 
+gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.4")
 gem "minitest", "~> 5.15.0"
 gem "pry", "~> 0.13.0"
 gem "pry-byebug", "~> 3.9.0"

data/acceptance/cases/models/insert_all_test.rb

@@ -0,0 +1,150 @@
+# Copyright 2022 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 "test_helper"
+require "models/author"
+
+module ActiveRecord
+  module Model
+    class InsertAllTest < SpannerAdapter::TestCase
+      include SpannerAdapter::Associations::TestHelper
+
+      def setup
+        super
+      end
+
+      def teardown
+        super
+        Author.destroy_all
+      end
+
+      def test_insert_all
+        values = [
+          { id: Author.next_sequence_value, name: "Alice" },
+          { id: Author.next_sequence_value, name: "Bob" },
+          { id: Author.next_sequence_value, name: "Carol" },
+        ]
+
+        assert_raise(NotImplementedError) { Author.insert_all(values) }
+      end
+
+      def test_insert_all!
+        values = [
+          { id: Author.next_sequence_value, name: "Alice" },
+          { id: Author.next_sequence_value, name: "Bob" },
+          { id: Author.next_sequence_value, name: "Carol" },
+        ]
+
+        Author.insert_all!(values)
+
+        authors = Author.all.order(:name)
+
+        assert_equal "Alice", authors[0].name
+        assert_equal "Bob", authors[1].name
+        assert_equal "Carol", authors[2].name
+      end
+
+      def test_insert_all_with_transaction
+        values = [
+          { id: Author.next_sequence_value, name: "Alice" },
+          { id: Author.next_sequence_value, name: "Bob" },
+          { id: Author.next_sequence_value, name: "Carol" },
+        ]
+
+        ActiveRecord::Base.transaction do
+          Author.insert_all!(values)
+        end
+
+        authors = Author.all.order(:name)
+
+        assert_equal "Alice", authors[0].name
+        assert_equal "Bob", authors[1].name
+        assert_equal "Carol", authors[2].name
+      end
+
+      def test_insert_all_with_buffered_mutation_transaction
+        values = [
+          { id: Author.next_sequence_value, name: "Alice" },
+          { id: Author.next_sequence_value, name: "Bob" },
+          { id: Author.next_sequence_value, name: "Carol" },
+        ]
+
+        ActiveRecord::Base.transaction isolation: :buffered_mutations do
+          Author.insert_all!(values)
+        end
+
+        authors = Author.all.order(:name)
+
+        assert_equal "Alice", authors[0].name
+        assert_equal "Bob", authors[1].name
+        assert_equal "Carol", authors[2].name
+      end
+
+      def test_upsert_all
+        Author.create id: 1, name: "David"
+        authors = Author.all.order(:name)
+        assert_equal 1, authors.length
+        assert_equal "David", authors[0].name
+
+        values = [
+          { id: 1, name: "Alice" },
+          { id: 2, name: "Bob" },
+          { id: 3, name: "Carol" },
+        ]
+
+        Author.upsert_all(values)
+
+        authors = Author.all.order(:name)
+
+        assert_equal 3, authors.length
+        assert_equal "Alice", authors[0].name
+        assert_equal "Bob", authors[1].name
+        assert_equal "Carol", authors[2].name
+      end
+
+      def test_upsert_all_with_transaction
+        values = [
+          { id: Author.next_sequence_value, name: "Alice" },
+          { id: Author.next_sequence_value, name: "Bob" },
+          { id: Author.next_sequence_value, name: "Carol" },
+        ]
+
+        err = assert_raise(NotImplementedError) do
+          ActiveRecord::Base.transaction do
+            Author.upsert_all(values)
+          end
+        end
+        assert_match "Use upsert outside a transaction block", err.message
+      end
+
+      def test_upsert_all_with_buffered_mutation_transaction
+        Author.create id: 1, name: "David"
+        authors = Author.all.order(:name)
+        assert_equal 1, authors.length
+        assert_equal "David", authors[0].name
+
+        values = [
+          { id: 1, name: "Alice" },
+          { id: 2, name: "Bob" },
+          { id: 3, name: "Carol" },
+        ]
+
+        ActiveRecord::Base.transaction isolation: :buffered_mutations do
+          Author.upsert_all(values)
+        end
+
+        authors = Author.all.order(:name)
+
+        assert_equal 3, authors.length
+        assert_equal "Alice", authors[0].name
+        assert_equal "Bob", authors[1].name
+        assert_equal "Carol", authors[2].name
+      end
+    end
+  end
+end

data/acceptance/cases/type/all_types_test.rb

@@ -30,7 +30,7 @@ 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: ENV["SPANNER_EMULATOR_HOST"] ? "" : { kind: "user_renamed", change: %w[jack john]},
+          col_json: { kind: "user_renamed", change: %w[jack john]},
           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"],
@@ -40,8 +40,7 @@ module ActiveRecord
           col_array_date: [::Date.new(2021, 6, 23), nil, ::Date.new(2021, 6, 24), "2021-06-25"],
           col_array_timestamp: [::Time.new(2021, 6, 23, 17, 8, 21, "+02:00"), nil, \
                                 ::Time.new(2021, 6, 24, 17, 8, 21, "+02:00"), "2021-06-25 17:08:21 +02:00"],
-          col_array_json: ENV["SPANNER_EMULATOR_HOST"] ? [""] : \
-                            [{ kind: "user_renamed", change: %w[jack john]}, nil, \
+          col_array_json: [{ kind: "user_renamed", change: %w[jack john]}, nil, \
                              { kind: "user_renamed", change: %w[alice meredith]},
                              "{\"kind\":\"user_renamed\",\"change\":[\"bob\",\"carol\"]}"]
       end
@@ -67,7 +66,7 @@ module ActiveRecord
           assert_equal ::Date.new(2021, 6, 23), record.col_date
           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 unless ENV["SPANNER_EMULATOR_HOST"]
+                       record.col_json
 
           assert_equal ["string1", nil, "string2"], record.col_array_string
           assert_equal [100, nil, 200, 300], record.col_array_int64
@@ -83,9 +82,9 @@ module ActiveRecord
                        record.col_array_timestamp.map { |timestamp| timestamp&.utc}
           assert_equal [{"kind" => "user_renamed", "change" => %w[jack john]}, \
                         nil, \
-                        {"kind" => "user_renamed", "change" => %w[alice meredith]},
-                        {"kind" => "user_renamed", "change" => %w[bob carol]}],
-                       record.col_array_json unless ENV["SPANNER_EMULATOR_HOST"]
+                        {"kind" => "user_renamed", "change" => %w[alice meredith]}, \
+                        "{\"kind\":\"user_renamed\",\"change\":[\"bob\",\"carol\"]}"],
+                       record.col_array_json
         end
       end
 
@@ -100,7 +99,7 @@ module ActiveRecord
                           col_bool: false, col_bytes: StringIO.new("new bytes"),
                           col_date: ::Date.new(2021, 6, 28),
                           col_timestamp: ::Time.new(2021, 6, 28, 11, 22, 21, "+02:00"),
-                          col_json: ENV["SPANNER_EMULATOR_HOST"] ? "" : { kind: "user_created", change: %w[jack alice]},
+                          col_json: { kind: "user_created", change: %w[jack alice]},
                           col_array_string: ["new string 1", "new string 2"],
                           col_array_int64: [300, 200, 100],
                           col_array_float64: [1.1, 2.2, 3.3],
@@ -109,9 +108,7 @@ 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: ENV["SPANNER_EMULATOR_HOST"] ?
-                                            [""] : \
-                                            [{ kind: "user_created", change: %w[jack alice]}]
+                          col_array_json: [{ kind: "user_created", change: %w[jack alice]}]
           end
 
           # Verify that the record was updated.
@@ -125,7 +122,7 @@ module ActiveRecord
           assert_equal ::Date.new(2021, 6, 28), record.col_date
           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 unless ENV["SPANNER_EMULATOR_HOST"]
+                     record.col_json
 
           assert_equal ["new string 1", "new string 2"], record.col_array_string
           assert_equal [300, 200, 100], record.col_array_int64
@@ -137,7 +134,7 @@ module ActiveRecord
           assert_equal [::Date.new(2021, 6, 28)], record.col_array_date
           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 unless ENV["SPANNER_EMULATOR_HOST"]
+                       record.col_array_json
         end
       end
 

data/acceptance/cases/type/json_test.rb

@@ -18,8 +18,6 @@ module ActiveRecord
       end
 
       def test_set_json
-        return if ENV["SPANNER_EMULATOR_HOST"]
-
         expected_hash = {"key"=>"value", "array_key"=>%w[value1 value2]}
         record = TestTypeModel.new details: {key: "value", array_key: %w[value1 value2]}
 

data/acceptance/schema/schema.rb

@@ -17,8 +17,7 @@ ActiveRecord::Schema.define do
       t.column :col_bytes, :binary
       t.column :col_date, :date
       t.column :col_timestamp, :datetime
-      t.column :col_json, :json unless ENV["SPANNER_EMULATOR_HOST"]
-      t.column :col_json, :string if ENV["SPANNER_EMULATOR_HOST"]
+      t.column :col_json, :json
 
       t.column :col_array_string, :string, array: true
       t.column :col_array_int64, :bigint, array: true
@@ -28,8 +27,7 @@ ActiveRecord::Schema.define do
       t.column :col_array_bytes, :binary, array: true
       t.column :col_array_date, :date, array: true
       t.column :col_array_timestamp, :datetime, array: true
-      t.column :col_array_json, :json, array: true unless ENV["SPANNER_EMULATOR_HOST"]
-      t.column :col_array_json, :string, array: true if ENV["SPANNER_EMULATOR_HOST"]
+      t.column :col_array_json, :json, array: true
     end
 
     create_table :firms do |t|

data/acceptance/test_helper.rb

@@ -208,7 +208,7 @@ module SpannerAdapter
           t.date :start_date
           t.datetime :start_datetime
           t.time :start_time
-          t.json :details unless ENV["SPANNER_EMULATOR_HOST"]
+          t.json :details
         end
       end
 

data/activerecord-spanner-adapter.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5"
 
   spec.add_dependency "google-cloud-spanner", "~> 2.10"
-  spec.add_runtime_dependency "activerecord", "~> 6.1.4"
+  spec.add_runtime_dependency "activerecord", [">= 6.0.0", "< 7.1"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
   spec.add_development_dependency "bundler", "~> 2.0"

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

@@ -10,14 +10,20 @@ module ActiveRecord
       class SchemaCreation < SchemaCreation
         private
 
-        # rubocop:disable Naming/MethodName, Metrics/AbcSize
+        # rubocop:disable Naming/MethodName, Metrics/AbcSize, Metrics/PerceivedComplexity
 
         def visit_TableDefinition o
           create_sql = +"CREATE TABLE #{quote_table_name o.name} "
           statements = o.columns.map { |c| accept c }
 
-          o.foreign_keys.each do |to_table, options|
-            statements << foreign_key_in_create(o.name, to_table, options)
+          if ActiveRecord::VERSION::MAJOR >= 7
+            o.foreign_keys.each do |fk|
+              statements << accept(fk)
+            end
+          else
+            o.foreign_keys.each do |to_table, options|
+              statements << foreign_key_in_create(o.name, to_table, options)
+            end
           end
 
           create_sql << "(#{statements.join ', '}) " if statements.any?
@@ -106,7 +112,7 @@ module ActiveRecord
           sql
         end
 
-        # rubocop:enable Naming/MethodName, Metrics/AbcSize
+        # rubocop:enable Naming/MethodName, Metrics/AbcSize, Metrics/PerceivedComplexity
 
         def add_column_options! sql, options
           if options[:null] == false || options[:primary_key] == true

data/lib/active_record/connection_adapters/spanner_adapter.rb

@@ -8,6 +8,7 @@ require "securerandom"
 require "google/cloud/spanner"
 require "spanner_client_ext"
 require "active_record/connection_adapters/abstract_adapter"
+require "active_record/connection_adapters/abstract/connection_pool"
 require "active_record/connection_adapters/spanner/database_statements"
 require "active_record/connection_adapters/spanner/schema_statements"
 require "active_record/connection_adapters/spanner/schema_cache"
@@ -43,9 +44,9 @@ module ActiveRecord
   module ConnectionAdapters
     module AbstractPool
       def get_schema_cache connection
-        @schema_cache ||= SpannerSchemaCache.new connection
-        @schema_cache.connection = connection
-        @schema_cache
+        self.schema_cache ||= SpannerSchemaCache.new connection
+        schema_cache.connection = connection
+        schema_cache
       end
     end
 
@@ -178,41 +179,73 @@ module ActiveRecord
         Arel::Visitors::Spanner.new self
       end
 
-      private
+      def build_insert_sql insert
+        if current_spanner_transaction&.isolation == :buffered_mutations
+          raise "ActiveRecordSpannerAdapter does not support insert_sql with buffered_mutations transaction."
+        end
 
-      def initialize_type_map m = type_map
-        m.register_type "BOOL", Type::Boolean.new
-        register_class_with_limit(
-          m, %r{^BYTES}i, ActiveRecord::Type::Spanner::Bytes
-        )
-        m.register_type "DATE", Type::Date.new
-        m.register_type "FLOAT64", Type::Float.new
-        m.register_type "NUMERIC", Type::Decimal.new
-        m.register_type "INT64", Type::Integer.new(limit: 8)
-        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
+        if insert.skip_duplicates? || insert.update_duplicates?
+          raise NotImplementedError, "CloudSpanner does not support skip_duplicates and update_duplicates."
+        end
 
-        register_array_types m
+        values_list, = insert.values_list
+        "INSERT #{insert.into} #{values_list}"
       end
 
-      def register_array_types m
-        m.register_type %r{^ARRAY<BOOL>}i, Type::Spanner::Array.new(Type::Boolean.new)
-        m.register_type %r{^ARRAY<BYTES\((MAX|d+)\)>}i, Type::Spanner::Array.new(ActiveRecord::Type::Spanner::Bytes.new)
-        m.register_type %r{^ARRAY<DATE>}i, Type::Spanner::Array.new(Type::Date.new)
-        m.register_type %r{^ARRAY<FLOAT64>}i, Type::Spanner::Array.new(Type::Float.new)
-        m.register_type %r{^ARRAY<NUMERIC>}i, Type::Spanner::Array.new(Type::Decimal.new)
-        m.register_type %r{^ARRAY<INT64>}i, Type::Spanner::Array.new(Type::Integer.new(limit: 8))
-        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)
+      module TypeMapBuilder
+        private
+
+        def initialize_type_map m = type_map
+          m.register_type "BOOL", Type::Boolean.new
+          register_class_with_limit(
+            m, %r{^BYTES}i, ActiveRecord::Type::Spanner::Bytes
+          )
+          m.register_type "DATE", Type::Date.new
+          m.register_type "FLOAT64", Type::Float.new
+          m.register_type "NUMERIC", Type::Decimal.new
+          m.register_type "INT64", Type::Integer.new(limit: 8)
+          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
+
+          register_array_types m
+        end
+
+        def register_array_types m
+          m.register_type %r{^ARRAY<BOOL>}i, Type::Spanner::Array.new(Type::Boolean.new)
+          m.register_type %r{^ARRAY<BYTES\((MAX|d+)\)>}i,
+                          Type::Spanner::Array.new(ActiveRecord::Type::Spanner::Bytes.new)
+          m.register_type %r{^ARRAY<DATE>}i, Type::Spanner::Array.new(Type::Date.new)
+          m.register_type %r{^ARRAY<FLOAT64>}i, Type::Spanner::Array.new(Type::Float.new)
+          m.register_type %r{^ARRAY<NUMERIC>}i, Type::Spanner::Array.new(Type::Decimal.new)
+          m.register_type %r{^ARRAY<INT64>}i, Type::Spanner::Array.new(Type::Integer.new(limit: 8))
+          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)
+        end
+
+        def extract_limit sql_type
+          value = /\((.*)\)/.match sql_type
+          return unless value
+
+          value[1] == "MAX" ? "MAX" : value[1].to_i
+        end
       end
 
-      def extract_limit sql_type
-        value = /\((.*)\)/.match sql_type
-        return unless value
+      if ActiveRecord::VERSION::MAJOR >= 7
+        class << self
+          include TypeMapBuilder
+        end
+
+        TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map m }
+
+        private
 
-        value[1] == "MAX" ? "MAX" : value[1].to_i
+        def type_map
+          TYPE_MAP
+        end
+      else
+        include TypeMapBuilder
       end
 
       def translate_exception exception, message:, sql:, binds:

data/lib/activerecord_spanner_adapter/base.rb

@@ -41,14 +41,69 @@ module ActiveRecord
       spanner_adapter? && connection&.current_spanner_transaction&.isolation == :buffered_mutations
     end
 
+    def self.insert_all _attributes, _returning: nil, _unique_by: nil
+      raise NotImplementedError, "Cloud Spanner does not support skip_duplicates."
+    end
+
+    def self.insert_all! attributes, returning: nil
+      return super unless spanner_adapter?
+      return super if active_transaction? && !buffered_mutations?
+
+      # This might seem inefficient, but is actually not, as it is only buffering a mutation locally.
+      # The mutations will be sent as one batch when the transaction is committed.
+      if active_transaction?
+        attributes.each do |record|
+          _insert_record record
+        end
+      else
+        transaction isolation: :buffered_mutations do
+          attributes.each do |record|
+            _insert_record record
+          end
+        end
+      end
+    end
+
+    def self.upsert_all attributes, returning: nil, unique_by: nil
+      return super unless spanner_adapter?
+      if active_transaction? && !buffered_mutations?
+        raise NotImplementedError, "Cloud Spanner does not support upsert using DML. " \
+                                   "Use upsert outside a transaction block or in a transaction " \
+                                   "block with isolation: :buffered_mutations"
+      end
+
+      # This might seem inefficient, but is actually not, as it is only buffering a mutation locally.
+      # The mutations will be sent as one batch when the transaction is committed.
+      if active_transaction?
+        attributes.each do |record|
+          _upsert_record record
+        end
+      else
+        transaction isolation: :buffered_mutations do
+          attributes.each do |record|
+            _upsert_record record
+          end
+        end
+      end
+    end
+
     def self._insert_record values
       return super unless buffered_mutations?
 
+      _buffer_record values, :insert
+    end
+
+    def self._upsert_record values
+      _buffer_record values, :insert_or_update
+    end
+
+    def self._buffer_record values, method
       primary_key = self.primary_key
       primary_key_value = nil
 
       if primary_key && values.is_a?(Hash)
         primary_key_value = values[primary_key]
+        primary_key_value ||= values[:"#{primary_key}"]
 
         if !primary_key_value && prefetch_primary_key?
           primary_key_value = next_sequence_value
@@ -59,13 +114,15 @@ module ActiveRecord
       metadata = TableMetadata.new self, arel_table
       columns, grpc_values = _create_grpc_values_for_insert metadata, values
 
+      write = Google::Cloud::Spanner::V1::Mutation::Write.new(
+        table: arel_table.name,
+        columns: columns,
+        values: [grpc_values.list_value]
+      )
       mutation = Google::Cloud::Spanner::V1::Mutation.new(
-        insert: Google::Cloud::Spanner::V1::Mutation::Write.new(
-          table: arel_table.name,
-          columns: columns,
-          values: [grpc_values.list_value]
-        )
+        "#{method}": write
       )
+
       connection.current_spanner_transaction.buffer mutation
 
       primary_key_value
@@ -87,6 +144,14 @@ module ActiveRecord
       !(current_transaction.nil? || current_transaction.is_a?(ConnectionAdapters::NullTransaction))
     end
 
+    def self.unwrap_attribute attr_or_value
+      if attr_or_value.is_a? ActiveModel::Attribute
+        attr_or_value.value
+      else
+        attr_or_value
+      end
+    end
+
     # Updates the given attributes of the object in the database. This method will use mutations instead
     # of DML if there is no active transaction, or if the active transaction has been created with the option
     # isolation: :buffered_mutations.
@@ -117,6 +182,7 @@ module ActiveRecord
       serialized_values = []
       columns = []
       values.each_pair do |k, v|
+        v = unwrap_attribute v
         type = metadata.type k
         serialized_values << (type.method(:serialize).arity < 0 ? type.serialize(v, :mutation) : type.serialize(v))
         columns << metadata.arel_table[k].name
@@ -168,6 +234,7 @@ module ActiveRecord
       all_values.each do |h|
         h.each_pair do |k, v|
           type = metadata.type k
+          v = self.class.unwrap_attribute v
           has_serialize_options = type.method(:serialize).arity < 0
           all_serialized_values << (has_serialize_options ? type.serialize(v, :mutation) : type.serialize(v))
           all_columns << metadata.arel_table[k].name

data/lib/activerecord_spanner_adapter/version.rb

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

data/lib/arel/visitors/spanner.rb

@@ -98,6 +98,16 @@ module Arel # :nodoc: all
         end
       end
 
+      # For ActiveRecord 7.0
+      def visit_ActiveModel_Attribute o, collector
+        # Do not generate a query parameter if the value should be set to the PENDING_COMMIT_TIMESTAMP(), as that is
+        # not supported as a parameter value by Cloud Spanner.
+        return collector << "PENDING_COMMIT_TIMESTAMP()" \
+          if o.type.is_a?(ActiveRecord::Type::Spanner::Time) && o.value == :commit_timestamp
+        collector.add_bind(o, &bind_block)
+      end
+
+      # For ActiveRecord 6.x
       def visit_Arel_Nodes_BindParam o, collector
         # Do not generate a query parameter if the value should be set to the PENDING_COMMIT_TIMESTAMP(), as that is
         # not supported as a parameter value by Cloud Spanner.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner
@@ -28,16 +28,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: autotest-suffix
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +270,7 @@ files:
 - acceptance/cases/migration/rename_column_test.rb
 - acceptance/cases/models/calculation_query_test.rb
 - acceptance/cases/models/generated_column_test.rb
+- acceptance/cases/models/insert_all_test.rb
 - acceptance/cases/models/mutation_test.rb
 - acceptance/cases/models/query_test.rb
 - acceptance/cases/sessions/session_not_found_test.rb
@@ -512,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: Rails ActiveRecord connector for Google Spanner Database