activerecord-spanner-adapter 1.6.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2a9a0a36a471ac93bdb0d59e50cc9b8e5c6647655487dc55a1d9e398abcf46
-  data.tar.gz: de680bcac6cf0f491bd0007d80d48496cf5e74b5eddf17d13b58353f06b818da
+  metadata.gz: e521009bd7ee056c90e4147edd3e6dfe012e7808abf8dcf2b9a0145f380d669d
+  data.tar.gz: 9be31f9f418a9ca5f80531924bc299a75c64826d09989c7318aff88eaccf8a41
 SHA512:
-  metadata.gz: '0658d456b4d6377bf5f95f44296869404ac9ac1c65aaa25360080bab1df7c122c4b7aba28992f5030e6465e51fefa1b6630a4e79547c65446edd29c40954ca61'
-  data.tar.gz: 470e026052a753f08d59f2824044894afe84d5601735270250c09368c7541ef98d5356a6ca6810c10755033a81601afb40826656967bdf8cda132563a2e9b267
+  metadata.gz: a529d5691fdcecc54e6a090a807c5b5ff561aa2a355d268a605c91b54705a9a093544129da76df2bb5341953a55dfac792be77079aa1b63121260eb8ed9559c3
+  data.tar.gz: 0f6be5f7de6113d16ce2f5e0474924ee4af6bdf3599c84050382f5c47a64f24876b656522e57ebb1e35742e6154221174b0a1e7487fa82034a5a4a5acfa527c2

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

@@ -18,16 +18,14 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
-        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
         # Exclude combinations that are not supported.
         exclude:
+          - ruby: "2.7"
+            ar: "~> 7.2.0"
           - ruby: "3.0"
-            ar: "~> 6.0.6"
-          - ruby: "3.1"
-            ar: "~> 6.0.6"
-          - ruby: "3.2"
-            ar: "~> 6.0.6"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: [3.0]
+        ruby: [3.3]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

data/.github/workflows/ci.yaml

@@ -10,16 +10,14 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
-        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
         # Exclude combinations that are not supported.
         exclude:
+          - ruby: "2.7"
+            ar: "~> 7.2.0"
           - ruby: "3.0"
-            ar: "~> 6.0.6"
-          - ruby: "3.1"
-            ar: "~> 6.0.6"
-          - ruby: "3.2"
-            ar: "~> 6.0.6"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -18,41 +18,14 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [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, 7.0.6, 7.0.7, 7.1.0, 7.1.1, 7.1.2]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: 3.0
-            ar: 6.0.0
-          - ruby: 3.0
-            ar: 6.0.1
-          - ruby: 3.0
-            ar: 6.0.2.2
-          - ruby: 3.0
-            ar: 6.0.3.7
-          - ruby: 3.0
-            ar: 6.0.4
-          - ruby: 3.1
-            ar: 6.0.0
-          - ruby: 3.1
-            ar: 6.0.1
-          - ruby: 3.1
-            ar: 6.0.2.2
-          - ruby: 3.1
-            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.7"
+            ar: "~> 7.2.0"
+          - ruby: "3.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: [3.0]
+        ruby: [3.3]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

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

@@ -10,41 +10,15 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        # Run unit tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [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, 7.1.0, 7.1.1, 7.1.2]
+        # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ar: ["~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "~> 7.2.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: 3.0
-            ar: 6.0.0
-          - ruby: 3.0
-            ar: 6.0.1
-          - ruby: 3.0
-            ar: 6.0.2.2
-          - ruby: 3.0
-            ar: 6.0.3.7
-          - ruby: 3.0
-            ar: 6.0.4
-          - ruby: 3.1
-            ar: 6.0.0
-          - ruby: 3.1
-            ar: 6.0.1
-          - ruby: 3.1
-            ar: 6.0.2.2
-          - ruby: 3.1
-            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.7"
+            ar: "~> 7.2.0"
+          - ruby: "3.0"
+            ar: "~> 7.2.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.kokoro/populate-secrets.sh

@@ -24,6 +24,10 @@ function msg { println "$*" >&2 ;}
 function println { printf '%s\n' "$(now) $*" ;}
 
 # Populates requested secrets set in SECRET_MANAGER_KEYS
+if [[ -z "${SECRET_MANAGER_PROJECT_ID-}" ]]; then
+  msg "SECRET_MANAGER_PROJECT_ID is not set in environment variables, using default"
+  SECRET_MANAGER_PROJECT_ID="cloud-devrel-kokoro-resources"
+fi
 
 # In Kokoro CI builds, we use the service account attached to the
 # Kokoro VM. This means we need to setup auth on other CI systems.
@@ -65,7 +69,7 @@ do
     msg "Retrieving secret ${key}"
     "${GCLOUD_COMMANDS[@]}" \
         secrets versions access latest \
-        --project cloud-devrel-kokoro-resources \
+        --project "${SECRET_MANAGER_PROJECT_ID}" \
         --secret $key > \
         "$SECRET_LOCATION/$key"
     if [[ $? == 0 ]]; then

data/.kokoro/release.cfg

@@ -7,19 +7,13 @@ action {
   }
 }
 
-# Download resources for system tests (service account key, etc.)
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-ruby"
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
 # Use the trampoline script to run in docker.
 build_file: "ruby-spanner-activerecord/.kokoro/trampoline_v2.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/yoshi-ruby/release"
+  value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/ruby-multi"
 }
 
 env_vars: {
@@ -27,16 +21,32 @@ env_vars: {
   value: ".kokoro/release.sh"
 }
 
+env_vars: {
+  key: "SECRET_MANAGER_PROJECT_ID"
+  value: "cloud-sdk-release-custom-pool"
+}
+
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,docuploader_service_account"
 }
 
+# Pick up Rubygems key from internal keystore
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "rubygems-publish-key"
+      backend: "blade:keystore-fastconfigpush"
+    }
+  }
+}
+
 # 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"
- }
-}
+  define_artifacts {
+    regex: "github/ruby-spanner-activerecord/pkg/*.gem"
+    strip_prefix: "github"
+  }
+}

data/.kokoro/trampoline_v2.sh

@@ -138,18 +138,26 @@ if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then
     RUNNING_IN_CI="true"
     TRAMPOLINE_CI="kokoro"
     if [[ "${TRAMPOLINE_USE_LEGACY_SERVICE_ACCOUNT:-}" == "true" ]]; then
-	if [[ ! -f "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" ]]; then
-	    log_red "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json does not exist. Did you forget to mount cloud-devrel-kokoro-resources/trampoline? Aborting."
-	    exit 1
-	fi
-	# This service account will be activated later.
-	TRAMPOLINE_SERVICE_ACCOUNT="${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json"
+        if [[ ! -f "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" ]]; then
+            log_red "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json does not exist. Did you forget to mount cloud-devrel-kokoro-resources/trampoline? Aborting."
+            exit 1
+        fi
+        # This service account will be activated later.
+        TRAMPOLINE_SERVICE_ACCOUNT="${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json"
     else
-	if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then
-	    gcloud auth list
-	fi
-	log_yellow "Configuring Container Registry access"
-	gcloud auth configure-docker --quiet
+        if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then
+            gcloud auth list
+        fi
+        log_yellow "Configuring Container Registry access"
+        TRAMPOLINE_HOST=$(echo "${TRAMPOLINE_IMAGE}" | cut -d/ -f1)
+        if [[ ! "${TRAMPOLINE_HOST}" =~ "gcr.io" ]]; then
+            # If you need to specificy a host other than gcr.io, you have to run on an update version of gcloud.
+            echo "TRAMPOLINE_HOST: ${TRAMPOLINE_HOST}"
+            gcloud components update
+            gcloud auth configure-docker "${TRAMPOLINE_HOST}"
+        else
+            gcloud auth configure-docker --quiet
+        fi
     fi
     pass_down_envvars+=(
 	# KOKORO dynamic variables.

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.6.3"
+  ".": "1.8.0"
 }

data/.trampolinerc

@@ -18,7 +18,12 @@ required_envvars+=(
 
 # Add env vars which are passed down into the container here.
 pass_down_envvars+=(
-    "AUTORELEASE_PR" "RELEASE_DRY_RUN" "RELEASE_PACKAGE" "KOKORO_GIT_COMMIT" "RUBY_VERSIONS" "EXTRA_CI_ARGS"
+    "AUTORELEASE_PR"
+    "EXTRA_CI_ARGS"
+    "KOKORO_GIT_COMMIT"
+    "RELEASE_DRY_RUN"
+    "RELEASE_PACKAGE"
+    "RUBY_VERSIONS"
 )
 
 # Prevent unintentional override on the default image.

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+### 1.8.0 (2024-12-12)
+
+#### Features
+
+* INSERT OR [IGNORE|UPDATE] ([#332](https://github.com/googleapis/ruby-spanner-activerecord/issues/332)) 
+#### Bug Fixes
+
+* Fixed incorrect argument handling. ([#333](https://github.com/googleapis/ruby-spanner-activerecord/issues/333)) 
+
+### 1.7.0 (2024-12-11)
+
+#### Features
+
+* support Rails 7.2.0 ([#328](https://github.com/googleapis/ruby-spanner-activerecord/issues/328)) 
+#### Bug Fixes
+
+* `SpannerAdapter` requires prepared statements to be enabled ([#323](https://github.com/googleapis/ruby-spanner-activerecord/issues/323)) 
+* local emulator test ([#320](https://github.com/googleapis/ruby-spanner-activerecord/issues/320)) 
+
 ### 1.6.3 (2024-08-31)
 
 #### Bug Fixes

data/Gemfile

@@ -3,7 +3,8 @@ 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 "activerecord", ENV.fetch("AR_VERSION", "~> 7.1.0")
+gem "ostruct"
 gem "minitest", "~> 5.25.0"
 gem "minitest-rg", "~> 5.3.0"
 gem "pry", "~> 0.13.0"
@@ -12,7 +13,7 @@ gem "pry-byebug", "~> 3.9.0"
 gem 'sqlite3', '~> 1.4'
 
 # Required for samples and testing.
-install_if -> { ENV.fetch("AR_VERSION", "~> 6.1.6.1").dup.to_s.sub("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
+install_if -> { ENV.fetch("AR_VERSION", "~> 7.1.0").dup.to_s.sub("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
   gem "composite_primary_keys"
 end
 

data/Rakefile

@@ -56,8 +56,8 @@ task :acceptance, [:project, :keyfile, :instance, :tests] do |t, args|
   tests ||= "**"
 
   # always overwrite when running tests
-  ENV["SPANNER_PROJECT"] = project
-  ENV["SPANNER_KEYFILE_JSON"] = keyfile
+  ENV["SPANNER_TEST_PROJECT"] = project
+  ENV["SPANNER_TEST_KEYFILE_JSON"] = keyfile
   ENV["SPANNER_TEST_INSTANCE"] = instance
   ENV["SPANNER_EMULATOR_HOST"] = emulator_host
 

data/acceptance/cases/migration/schema_dumper_test.rb

@@ -17,15 +17,27 @@ module ActiveRecord
         ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
       end
 
+      def is_7_2_or_higher?
+        ActiveRecord::gem_version >= Gem::Version.create('7.2.0')
+      end
+
+      def pool_or_connection
+        if is_7_2_or_higher?
+          ActiveRecord::Base.connection_pool
+        else
+          ActiveRecord::Base.connection
+        end
+      end
+
       def test_dump_schema_contains_start_batch_ddl
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("connection.start_batch_ddl")
       end
 
       def test_dump_schema_contains_run_batch
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("  connection.run_batch\n"\
@@ -35,7 +47,7 @@ module ActiveRecord
       end
 
       def test_dump_schema_contains_albums_table
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         sql = schema.string
@@ -47,42 +59,42 @@ module ActiveRecord
       end
 
       def test_dump_schema_contains_interleaved_index
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("t.index [\"singerid\", \"albumid\", \"title\"], name: \"index_tracks_on_singerid_and_albumid_and_title\", order: { singerid: :asc, albumid: :asc, title: :asc }, null_filtered: true, interleave_in: \"albums\""), schema.string
       end
 
       def test_dump_schema_should_not_contain_id_limit
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert !schema.string.include?("id: { limit: 8 }")
       end
 
       def test_dump_schema_contains_commit_timestamp
-        connection = ActiveRecord::Base.connection
+        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
       end
 
       def test_dump_schema_contains_virtual_column
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("t.virtual \"full_name\", type: :string, as: \"COALESCE(first_name || ' ', '') || last_name\", stored: true"), schema.string
       end
 
       def test_dump_schema_contains_string_array
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("t.string \"col_array_string\", array: true"), schema.string
       end
 
       def test_dump_schema_index_storing
-        connection = ActiveRecord::Base.connection
+        connection = pool_or_connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
         assert schema.string.include?("t.index [\"last_name\"], name: \"index_singers_on_last_name\", order: { last_name: :asc }, storing: [\"first_name\", \"tracks_count\"]"), schema.string

data/acceptance/cases/models/insert_all_test.rb

@@ -30,13 +30,24 @@ module ActiveRecord
           { id: Author.next_sequence_value, name: "Carol" },
         ]
 
-        assert_raise(NotImplementedError) { Author.insert_all(values) }
+        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
         value = { id: Author.next_sequence_value, name: "Alice" }
 
-        assert_raise(NotImplementedError) { Author.insert(value) }
+        Author.insert(value)
+
+        authors = Author.all.order(:name)
+
+        assert_equal 1, authors.length
+        assert_equal "Alice", authors[0].name
       end
 
       def test_insert_all!
@@ -136,12 +147,16 @@ module ActiveRecord
           { id: Author.next_sequence_value, name: "Carol" },
         ]
 
-        err = assert_raise(NotImplementedError) do
-          ActiveRecord::Base.transaction do
-            Author.upsert_all(values)
-          end
+        ActiveRecord::Base.transaction do
+          Author.upsert_all(values)
         end
-        assert_match "Use upsert outside a transaction block", err.message
+
+        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_buffered_mutation_transaction

data/acceptance/cases/sessions/session_not_found_test.rb

@@ -51,6 +51,8 @@ module ActiveRecord
         sessions.each do |session|
           client.delete_session Google::Cloud::Spanner::V1::DeleteSessionRequest.new name: session.name
         end
+        # Wait a bit to ensure that the sessions are really deleted.
+        sleep 5 unless ENV["SPANNER_EMULATOR_HOST"]
       end
 
       def test_single_read

data/acceptance/cases/tasks/database_tasks_test.rb

@@ -48,6 +48,7 @@ module ActiveRecord
       end
 
       def teardown
+        drop_database
         ActiveRecord::Base.connection_pool.disconnect!
         FileUtils.rm_rf ActiveRecord::Tasks::DatabaseTasks.db_dir
         ActiveRecord::Tasks::DatabaseTasks.db_dir = @original_db_dir

data/acceptance/test_helper.rb

@@ -8,6 +8,7 @@ gem "minitest"
 require "minitest/autorun"
 require "minitest/focus"
 require "minitest/rg"
+require "ostruct"
 require "active_support"
 require "google/cloud/spanner"
 require "active_record"
@@ -18,7 +19,10 @@ require "securerandom"
 require "composite_primary_keys" if ActiveRecord::gem_version < Gem::Version.create('7.1.0')
 
 # rubocop:disable Style/GlobalVars
-
+#
+if ActiveRecord.gem_version >= Gem::Version.create("7.2.0")
+  ActiveRecord::ConnectionAdapters.register("spanner", "ActiveRecord::ConnectionAdapters::SpannerAdapter")
+end
 $spanner_test_database = "ar-test-#{SecureRandom.hex 4}"
 
 def connector_config

data/activerecord-spanner-adapter.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "google-cloud-spanner", "~> 2.18"
   # Pin gRPC to 1.64.3, as 1.65 and 1.66 cause test runs to hang randomly.
   spec.add_dependency "grpc", "1.64.3"
-  spec.add_runtime_dependency "activerecord", [">= 6.0.0", "< 7.2"]
+  spec.add_runtime_dependency "activerecord", [">= 6.1", "< 7.3"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
   spec.add_development_dependency "bundler", "~> 2.0"

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

@@ -21,15 +21,15 @@ module ActiveRecord
           internal_execute sql, name, binds
         end
 
-        def internal_exec_query sql, name = "SQL", binds = [], prepare: false, async: false
-          result = internal_execute sql, name, binds, prepare: prepare, async: async
+        def internal_exec_query sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false
+          result = internal_execute sql, name, binds, prepare: prepare, async: async, allow_retry: allow_retry
           ActiveRecord::Result.new(
             result.fields.keys.map(&:to_s), result.rows.map(&:values)
           )
         end
 
         def internal_execute sql, name = "SQL", binds = [],
-                             prepare: false, async: false # rubocop:disable Lint/UnusedMethodArgument
+                             prepare: false, async: false, allow_retry: false # rubocop:disable Lint/UnusedMethodArgument, Metrics/LineLength
           statement_type = sql_statement_type sql
           # Call `transform` to invoke any query transformers that might have been registered.
           sql = transform sql
@@ -320,6 +320,8 @@ module ActiveRecord
             elsif bind.class == Symbol
               # This ensures that for example :environment is sent as the string 'environment' to Cloud Spanner.
               type = :STRING
+            elsif bind.class == TrueClass || bind.class == FalseClass
+              type = :BOOL
             end
             [
               # Generates binds for named parameters in the format `@p1, @p2, ...`

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

@@ -30,17 +30,29 @@
 
 module ActiveRecord
   module ConnectionAdapters
+    QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
+    QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
+
+    module Quoting
+      module ClassMethods
+        # This is used for ActiveRecord v8 and higher.
+        def quote_column_name name
+          QUOTED_COLUMN_NAMES[name] ||= "`#{name.to_s.gsub '`', '``'}`".freeze
+        end
+
+        def quote_table_name name
+          QUOTED_TABLE_NAMES[name] ||= "`#{name.to_s.gsub '.', '`.`'}`".freeze
+        end
+      end
+    end
     module Spanner
       module Quoting
-        QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
-        QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
-
         def quote_column_name name
-          QUOTED_COLUMN_NAMES[name] ||= "`#{super.gsub '`', '``'}`".freeze
+          QUOTED_COLUMN_NAMES[name] ||= "`#{name.to_s.gsub '`', '``'}`".freeze
         end
 
         def quote_table_name name
-          QUOTED_TABLE_NAMES[name] ||= super.gsub(".", "`.`").freeze
+          QUOTED_TABLE_NAMES[name] ||= "`#{name.to_s.gsub '.', '`.`'}`".freeze
         end
 
         STR_ESCAPE_REGX = /[\n\r'\\]/.freeze

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

@@ -23,6 +23,7 @@ module ActiveRecord
       module SchemaStatements
         VERSION_6_1_0 = Gem::Version.create "6.1.0"
         VERSION_6_0_3 = Gem::Version.create "6.0.3"
+        VERSION_7_2 = Gem::Version.create "7.2.0"
 
         def current_database
           @connection.database_id
@@ -401,6 +402,16 @@ module ActiveRecord
           information_schema { |i| i.check_constraints table_name }
         end
 
+        if ActiveRecord.gem_version >= VERSION_7_2
+          def migration_context
+            pool.migration_context
+          end
+
+          def schema_migration
+            pool.schema_migration
+          end
+        end
+
         def assume_migrated_upto_version version
           version = version.to_i
           sm_table = quote_table_name schema_migration.table_name

data/lib/active_record/connection_adapters/spanner_adapter.rb

@@ -28,16 +28,18 @@ require "activerecord_spanner_adapter/primary_key"
 require "activerecord_spanner_adapter/transaction"
 
 module ActiveRecord
-  module ConnectionHandling # :nodoc:
-    def spanner_connection config
-      connection = ActiveRecordSpannerAdapter::Connection.new config
-      connection.connect!
-      ConnectionAdapters::SpannerAdapter.new connection, logger, nil, config
-    rescue Google::Cloud::Error => error
-      if error.instance_of? Google::Cloud::NotFoundError
-        raise ActiveRecord::NoDatabaseError
-      end
-      raise error
+  if ActiveRecord.version < Gem::Version.new("7.2")
+    module ConnectionHandling # :nodoc:
+      def spanner_connection config
+        connection = ActiveRecordSpannerAdapter::Connection.new config
+        connection.connect!
+        ConnectionAdapters::SpannerAdapter.new connection, logger, nil, config
+      rescue Google::Cloud::Error => error
+        if error.instance_of? Google::Cloud::NotFoundError
+          raise ActiveRecord::NoDatabaseError
+        end
+        raise error
+      end
     end
   end
 
@@ -69,11 +71,21 @@ module ActiveRecord
       # Determines whether or not to log query binds when executing statements
       class_attribute :log_statement_binds, instance_writer: false, default: false
 
-      def initialize connection, logger, connection_options, config
-        @connection = connection
-        @connection_options = connection_options
-        super connection, logger, config
-        @raw_connection ||= connection
+      def initialize config_or_deprecated_connection, deprecated_logger = nil,
+                     deprecated_connection_options = nil, deprecated_config = nil
+        if config_or_deprecated_connection.is_a? Hash
+          @connection = ActiveRecordSpannerAdapter::Connection.new config_or_deprecated_connection
+          @connection.connect!
+          super config_or_deprecated_connection
+          @raw_connection ||= @connection
+        else
+          @connection = config_or_deprecated_connection
+          @connection_options = deprecated_connection_options
+          super config_or_deprecated_connection, deprecated_logger, deprecated_config
+          @raw_connection ||= config_or_deprecated_connection
+        end
+        # Spanner does not support unprepared statements
+        @prepared_statements = true
       end
 
       def max_identifier_length
@@ -197,12 +209,14 @@ module ActiveRecord
           raise "ActiveRecordSpannerAdapter does not support insert_sql with buffered_mutations transaction."
         end
 
-        if insert.skip_duplicates? || insert.update_duplicates?
-          raise NotImplementedError, "CloudSpanner does not support skip_duplicates and update_duplicates."
-        end
-
         values_list, = insert.values_list
-        "INSERT #{insert.into} #{values_list}"
+        prefix = "INSERT"
+        if insert.update_duplicates?
+          prefix += " OR UPDATE"
+        elsif insert.skip_duplicates?
+          prefix += " OR IGNORE"
+        end
+        "#{prefix} #{insert.into} #{values_list}"
       end
 
       module TypeMapBuilder

data/lib/activerecord-spanner-adapter.rb

@@ -15,7 +15,11 @@ if defined?(Rails)
         end
 
         ActiveSupport.on_load :active_record do
-          require "active_record/connection_adapters/spanner_adapter"
+          if Rails.version >= "7.2.0"
+            ActiveRecord::ConnectionAdapters.register("spanner", "ActiveRecord::ConnectionAdapters::SpannerAdapter")
+          else
+            require "active_record/connection_adapters/spanner_adapter"
+          end
         end
       end
     end

data/lib/activerecord_spanner_adapter/base.rb

@@ -16,6 +16,7 @@ module ActiveRecord
 
   class Base
     VERSION_7_1 = Gem::Version.create "7.1.0"
+    VERSION_7_2 = Gem::Version.create "7.2.0"
 
     # Creates an object (or multiple objects) and saves it to 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
@@ -48,8 +49,26 @@ module ActiveRecord
       spanner_adapter? && connection&.current_spanner_transaction&.isolation == :buffered_mutations
     end
 
-    def self._insert_record values, returning = []
-      if !(buffered_mutations? || (primary_key && values.is_a?(Hash))) || !spanner_adapter?
+    def self._should_use_standard_insert_record? values
+      !(buffered_mutations? || (primary_key && values.is_a?(Hash))) || !spanner_adapter?
+    end
+
+    def self._internal_insert_record values
+      if ActiveRecord.gem_version < VERSION_7_2
+        _insert_record values
+      else
+        _insert_record nil, values
+      end
+    end
+
+    def self._insert_record *args
+      if ActiveRecord.gem_version < VERSION_7_2
+        values, returning = args
+      else
+        _connection, values, returning = args
+      end
+
+      if _should_use_standard_insert_record? values
         return super values if ActiveRecord.gem_version < VERSION_7_1
         return super
       end
@@ -111,8 +130,20 @@ module ActiveRecord
       _buffer_record values, :insert_or_update, returning
     end
 
-    def self.insert_all _attributes, **_kwargs
-      raise NotImplementedError, "Cloud Spanner does not support skip_duplicates. Use insert! or upsert instead."
+    def self.insert_all attributes, returning: nil, **_kwargs
+      if active_transaction? && buffered_mutations?
+        raise NotImplementedError,
+              "Spanner does not support skip_duplicates for mutations. " \
+              "Use a transaction that uses DML, or use insert! or upsert instead."
+      end
+      super
+    end
+
+    def self.insert! attributes, returning: nil, **kwargs
+      return super unless spanner_adapter?
+      return super if active_transaction? && !buffered_mutations?
+
+      insert_all! [attributes], returning: returning, **kwargs
     end
 
     def self.insert_all! attributes, returning: nil, **_kwargs
@@ -123,24 +154,27 @@ module ActiveRecord
       # The mutations will be sent as one batch when the transaction is committed.
       if active_transaction?
         attributes.each do |record|
-          _insert_record record
+          _internal_insert_record record
         end
       else
         transaction isolation: :buffered_mutations do
           attributes.each do |record|
-            _insert_record record
+            _internal_insert_record record
           end
         end
       end
     end
 
-    def self.upsert_all attributes, returning: nil, unique_by: nil, **_kwargs
+    def self.upsert attributes, returning: nil, **kwargs
       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
+      return super if active_transaction? && !buffered_mutations?
+
+      upsert_all [attributes], returning: returning, **kwargs
+    end
+
+    def self.upsert_all attributes, returning: nil, unique_by: nil, **kwargs
+      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.

data/lib/activerecord_spanner_adapter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: autotest-suffix
   requirement: !ruby/object:Gem::Requirement
@@ -589,7 +589,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: Rails ActiveRecord connector for Google Spanner Database