activerecord-spanner-adapter 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcc2624f18893422bf8ac9c23d07fff039e79cee5f51b975054314f49820b694
-  data.tar.gz: 7145b48f67236eb7ee9aac20bd1dfa907268419f262abf82cd6973acba25ab64
+  metadata.gz: 5f8199e1af804baf47d382e53404f88329478d35958f71fcaec34f73921de987
+  data.tar.gz: b2bc3919e5cc4d675d539806c27e0dda7b16d676ca349aa95a11370c4ec145b7
 SHA512:
-  metadata.gz: 49aed5257b191aee1e9271c1d04e91c2ff1663c78e9b1e70e89acda430587324991a10cb1b2aabdfd9b1e9d70ab862b3a1579fda5c032023175303fa260deeed
-  data.tar.gz: 1764369d2a370d4c8d35cbbcd3b9c45130514cc6e76bac67e5a9dafbf2bf020734b973be44f354b13da9acaaffdebaba78e31046da56c6e62efe0546aca30611
+  metadata.gz: 22ed1bd5840aa615681a7af2a4f87ceb31a5ec5a772d3260740ed520f99269b1ecdc0022aa1bcbf703afe01d99a04bb6181d546c5d6690bef20c17142281eb47
+  data.tar.gz: b9d65faf249175397de04b003a612ed10f89302ba545ffe09208b43414e9e8291feb9240aae3850f5f97d6f6b0bfd9c6134176316ebf6cc520d487e8d9700447

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
 
-*     @jiren @skuruppu @dazuma @hengfengli @olavloite @xiangshen-dk
+*     @googleapis/ruby-team @skuruppu @hengfengli @olavloite @xiangshen-dk

data/.github/sync-repo-settings.yaml

@@ -10,7 +10,7 @@ branchProtectionRules:
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: true
 permissionRules:
-  - team: yoshi-ruby
+  - team: ruby-team
     permission: push
-  - team: yoshi-ruby-admins
+  - team: ruby-admins
     permission: admin

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

@@ -19,13 +19,19 @@ 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.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
-            ar: 6.0.4
+            ar: 6.0.5.1
+          - ruby: 2.6
+            ar: 7.0.2.4
+          - ruby: 2.6
+            ar: 7.0.3.1
+    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 +39,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

@@ -10,14 +10,18 @@ jobs:
     strategy:
       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.
+        ruby: ["2.6", "2.7", "3.0"]
+        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: "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

@@ -2,6 +2,7 @@ on:
   schedule:
     # 06:00 UTC
     - cron:  '0 6 * * *'
+  workflow_dispatch:
 name: nightly acceptance tests on emulator
 jobs:
   test:
@@ -19,8 +20,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.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.0
@@ -32,16 +33,24 @@ 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
+          - ruby: 2.5
+            ar: 7.0.3.1
+          - ruby: 2.6
+            ar: 7.0.3.1
+    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

@@ -2,6 +2,7 @@ on:
   schedule:
     # 05:30 UTC
     - cron:  '30 5 * * *'
+  workflow_dispatch:
 name: nightly-unit-tests
 jobs:
   test:
@@ -11,8 +12,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.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1]
+        # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
             ar: 6.0.0
@@ -24,16 +25,24 @@ 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
+          - ruby: 2.5
+            ar: 7.0.3.1
+          - ruby: 2.6
+            ar: 7.0.3.1
+    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/.kokoro/release.sh

@@ -7,9 +7,7 @@ set -eo pipefail
 export GEM_HOME=$HOME/.gem
 export PATH=$GEM_HOME/bin:$PATH
 
-python3 -m pip install git+https://github.com/googleapis/releasetool
-python3 -m pip install gcp-docuploader
 gem install --no-document toys
-
+toys release install-python-tools -v
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 toys release perform -v --enable-docs < /dev/null

data/.release-please-manifest.json

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

data/.toys/release.rb

@@ -14,5 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load_git remote: "https://github.com/googleapis/ruby-common-tools.git",
-         path: "toys/release"
+if ENV["RUBY_COMMON_TOOLS"]
+  common_tools_dir = File.expand_path ENV["RUBY_COMMON_TOOLS"]
+  load File.join(common_tools_dir, "toys", "release")
+else
+  load_git remote: "https://github.com/googleapis/ruby-common-tools.git",
+           path: "toys/release",
+           update: true
+end

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+### 1.2.1 (2022-08-28)
+
+#### Bug Fixes
+
+* Corrected the namespace for the transaction selector class ([#187](https://github.com/googleapis/ruby-spanner-activerecord/issues/187)) 
+
+### 1.2.0 (2022-08-03)
+
+#### Features
+
+* support composite primary keys for interleaved tables ([#175](https://github.com/googleapis/ruby-spanner-activerecord/issues/175)) 
+
+### 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,10 +3,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-spanner.gemspec
 gemspec
 
+gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.6.1")
 gem "minitest", "~> 5.15.0"
 gem "pry", "~> 0.13.0"
 gem "pry-byebug", "~> 3.9.0"
 
+# Required for samples and testing.
+gem "composite_primary_keys"
+
 # Required for samples
-gem 'docker-api'
+gem "docker-api"
 gem "sinatra-activerecord"

data/acceptance/cases/interleaved_associations/has_many_associations_using_interleaved_test.rb

@@ -20,6 +20,8 @@ module ActiveRecord
 
       def setup
         super
+        @original_verbosity = $VERBOSE
+        $VERBOSE = nil
 
         @singer = Singer.create first_name: "FirstName1", last_name: "LastName1"
 
@@ -35,6 +37,8 @@ module ActiveRecord
       def teardown
         Album.destroy_all
         Singer.destroy_all
+
+        $VERBOSE = @original_verbosity
       end
 
       def test_has_many
@@ -73,8 +77,8 @@ module ActiveRecord
 
       def test_create_and_destroy_associated_records
         singer2 = Singer.new first_name: "First", last_name: "Last"
-        singer2.albums.build title: "New Title 1"
-        singer2.albums.build title: "New Title 2"
+        singer2.albums.build title: "New Title 1", albumid: Album.next_sequence_value
+        singer2.albums.build title: "New Title 2", albumid: Album.next_sequence_value
         singer2.save!
 
         singer2.reload
@@ -91,8 +95,8 @@ module ActiveRecord
 
       def test_create_and_destroy_nested_associated_records
         album3 = Album.new singer: singer, title: "Title 3"
-        album3.tracks.build title: "Title3_1", duration: 2.5, singer: singer
-        album3.tracks.build title: "Title3_2", singer: singer
+        album3.tracks.build title: "Title3_1", duration: 2.5, singer: singer, trackid: Track.next_sequence_value
+        album3.tracks.build title: "Title3_2", singer: singer, trackid: Track.next_sequence_value
         album3.save!
 
         album3.reload
@@ -110,8 +114,8 @@ module ActiveRecord
 
       def test_create_and_delete_associated_records
         singer2 = Singer.new first_name: "First", last_name: "Last"
-        singer2.albums.build title: "Album - 11"
-        singer2.albums.build title: "Album - 12"
+        singer2.albums.build title: "Album - 11", albumid: Album.next_sequence_value
+        singer2.albums.build title: "Album - 12", albumid: Album.next_sequence_value
         singer2.save!
 
         singer2.reload
@@ -128,8 +132,8 @@ module ActiveRecord
 
       def test_create_and_delete_nested_associated_records
         album3 = Album.new title: "Album 3", singer: singer
-        album3.tracks.build title: "Track - 31", singer: singer
-        album3.tracks.build title: "Track - 32", singer: singer
+        album3.tracks.build title: "Track - 31", singer: singer, trackid: Track.next_sequence_value
+        album3.tracks.build title: "Track - 32", singer: singer, trackid: Track.next_sequence_value
         album3.save!
 
         album3.reload

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/transactions/optimistic_locking_test.rb

@@ -19,6 +19,9 @@ module ActiveRecord
       def setup
         super
 
+        @original_verbosity = $VERBOSE
+        $VERBOSE = nil
+
         singer = Singer.create first_name: "Pete", last_name: "Allison"
         album = Album.create title: "Musical Jeans", singer: singer
         Track.create title: "Increased Headline", album: album, singer: singer
@@ -30,6 +33,8 @@ module ActiveRecord
         Track.delete_all
         Album.delete_all
         Singer.delete_all
+
+        $VERBOSE = @original_verbosity
       end
 
       # Runs the given block in a transaction with the given isolation level, or without a transaction if isolation is

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]}