activerecord-spanner-adapter 1.6.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2a9a0a36a471ac93bdb0d59e50cc9b8e5c6647655487dc55a1d9e398abcf46
-  data.tar.gz: de680bcac6cf0f491bd0007d80d48496cf5e74b5eddf17d13b58353f06b818da
+  metadata.gz: df28341210b0da8f86475dc621e5c4113ad00a72b23fa6bc3e224a0064c7e267
+  data.tar.gz: 00eed36443cb2cd7c99869a6e2ff3821c16fd2a16a3d937dd831c3226743ef19
 SHA512:
-  metadata.gz: '0658d456b4d6377bf5f95f44296869404ac9ac1c65aaa25360080bab1df7c122c4b7aba28992f5030e6465e51fefa1b6630a4e79547c65446edd29c40954ca61'
-  data.tar.gz: 470e026052a753f08d59f2824044894afe84d5601735270250c09368c7541ef98d5356a6ca6810c10755033a81601afb40826656967bdf8cda132563a2e9b267
+  metadata.gz: a53ee5f7ab4d576a969631ce6125557a6171f91dd372f71c03c34c62b67b9363e0898d4b8d7ff3836d58efd73fd2a71dbf108668c5e837634864e017d129b8ca
+  data.tar.gz: 665f4e837ee3dee167c2d5e4160dfe03fb3008903f3be50dbae50dd07fcea8b01b7b561b683c825c460a3462d0f729c5ace143c4285d9eb05b2871776086cd94

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

@@ -18,16 +18,12 @@ 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: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "3.0"
-            ar: "~> 6.0.6"
           - ruby: "3.1"
-            ar: "~> 6.0.6"
-          - ruby: "3.2"
-            ar: "~> 6.0.6"
+            ar: "~> 8.0.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,12 @@ 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: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: "3.0"
-            ar: "~> 6.0.6"
           - ruby: "3.1"
-            ar: "~> 6.0.6"
-          - ruby: "3.2"
-            ar: "~> 6.0.6"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -18,41 +18,12 @@ 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: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.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: "3.1"
+            ar: "~> 8.0.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,13 @@ 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: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.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: "3.1"
+            ar: "~> 8.0.0"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/rubocop.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: setup ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.3'
     - name: cache gems
       uses: actions/cache@v4
       with:

data/.github/workflows/samples.yaml

@@ -0,0 +1,30 @@
+on:
+  pull_request:
+name: samples
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        ruby: ["3.1", "3.2", "3.3"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        # Exclude combinations that are not supported.
+        exclude:
+          - ruby: "3.1"
+            ar: "~> 8.0.0"
+    env:
+      AR_VERSION: ${{ matrix.ar }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: false
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run samples
+      run: bundle exec rake all
+      working-directory: examples/snippets

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/release.sh

@@ -8,6 +8,4 @@ export GEM_HOME=$HOME/.gem
 export PATH=$GEM_HOME/bin:$PATH
 
 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
+toys release perform -v --reporter-org=googleapis --enable-docs --force-republish --enable-docs --enable-rad < /dev/null

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"
+  ".": "2.0.0"
 }

data/.rubocop.yml

@@ -16,7 +16,7 @@ AllCops:
 
 Documentation:
   Enabled: false
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
@@ -24,7 +24,7 @@ Metrics/ModuleLength:
   Enabled: false
 Naming/RescuedExceptionsVariableName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false

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,42 @@
 # Changelog
 
+### 2.0.0 (2025-01-23)
+
+### ⚠ BREAKING CHANGES
+
+* drop support for Rails 6.1 ([#346](https://github.com/googleapis/ruby-spanner-activerecord/issues/346))
+* deserialize BYTES to StringIO ([#343](https://github.com/googleapis/ruby-spanner-activerecord/issues/343))
+
+#### Features
+
+* drop support for Rails 6.1 ([#346](https://github.com/googleapis/ruby-spanner-activerecord/issues/346)) 
+* support Rails 8.0 ([#331](https://github.com/googleapis/ruby-spanner-activerecord/issues/331)) 
+#### Bug Fixes
+
+* deserialize BYTES to StringIO ([#343](https://github.com/googleapis/ruby-spanner-activerecord/issues/343)) 
+#### Documentation
+
+* add rails dbconsole to list of limitations ([#224](https://github.com/googleapis/ruby-spanner-activerecord/issues/224)) 
+
+### 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,16 +3,18 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-spanner.gemspec
 gemspec
 
-gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.6.1")
+ar_version = ENV.fetch("AR_VERSION", "~> 7.1.0")
+gem "activerecord", ar_version
+gem "ostruct"
 gem "minitest", "~> 5.25.0"
 gem "minitest-rg", "~> 5.3.0"
-gem "pry", "~> 0.13.0"
-gem "pry-byebug", "~> 3.9.0"
+gem "pry", "~> 0.14.2"
+gem "pry-byebug", "~> 3.10.1"
 # Add sqlite3 for testing for compatibility with other adapters.
-gem 'sqlite3', '~> 1.4'
+gem 'sqlite3'
 
 # 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 -> { ar_version.dup.to_s.sub("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
   gem "composite_primary_keys"
 end
 

data/README.md

@@ -89,15 +89,17 @@ Some noteworthy examples in the snippets directory:
 
 ## Limitations
 
-| Limitation                                                                                                                        | Comment                                                                                                                                                                                                                           | Resolution                                                                                  |
-|-----------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
-| Interleaved tables require composite primary keys                                                                                 | Cloud Spanner requires composite primary keys for interleaved tables. See {file:examples/snippets/interleaved-tables/README.md this example} for an example on how to use interleaved tables with ActiveRecord                        | Use composite primary keys.                                                                 |
-| Lack of sequential IDs                                                                                                            | Cloud Spanner uses either using bit-reversed sequences or UUID4 to generated primary keys to avoid [hotspotting](https://cloud.google.com/spanner/docs/schema-design#uuid_primary_key) so you SHOULD NOT rely on IDs being sorted | Use either UUID4s or bit-reversed sequences to automatically generate primary keys.         |
-| Table without Primary Key                                                                                                         | Cloud Spanner support does not support tables without a primary key.                                                                                                                                                              | Always define a primary key for your table.                                                 |
-| Table names CANNOT have spaces within them whether back-ticked or not                                                             | Cloud Spanner DOES NOT support tables with spaces in them for example `Entity ID`                                                                                                                                                 | Ensure that your table names don't contain spaces.                                          |
-| Table names CANNOT have punctuation marks and MUST contain valid UTF-8                                                            | Cloud Spanner DOES NOT support punctuation marks e.g. periods ".", question marks "?" in table names                                                                                                                              | Ensure that your table names don't contain punctuation marks.                               |
-| Index with fields length [add_index](https://apidock.com/rails/v5.2.3/ActiveRecord/ConnectionAdapters/SchemaStatements/add_index) | Cloud Spanner does not support index with fields length                                                                                                                                                                           | Ensure that your database definition does not include index definitions with field lengths. |
-| Only GoogleSQL-dialect databases                                                                                                  | Cloud Spanner supports both GoogleSQL- and PostgreSQL-dialect databases. This adapter only supports GoogleSQL-dialect databases.                                                                                                  | Ensure that your database uses the GoogleSQL dialect.                                       |
+| Limitation                                                                                                                        | Comment                                                                                                                                                                                                                                                                                                                                                 | Resolution                                                                                  |
+|-----------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| Interleaved tables require composite primary keys                                                                                 | Cloud Spanner requires composite primary keys for interleaved tables. See {file:examples/snippets/interleaved-tables/README.md this example} for an example on how to use interleaved tables with ActiveRecord                                                                                                                                              | Use composite primary keys.                                                                 |
+| Lack of sequential IDs                                                                                                            | Cloud Spanner uses either using bit-reversed sequences or UUID4 to generated primary keys to avoid [hotspotting](https://cloud.google.com/spanner/docs/schema-design#uuid_primary_key) so you SHOULD NOT rely on IDs being sorted                                                                                                                       | Use either UUID4s or bit-reversed sequences to automatically generate primary keys.         |
+| Table without Primary Key                                                                                                         | Cloud Spanner support does not support tables without a primary key.                                                                                                                                                                                                                                                                                    | Always define a primary key for your table.                                                 |
+| Table names CANNOT have spaces within them whether back-ticked or not                                                             | Cloud Spanner DOES NOT support tables with spaces in them for example `Entity ID`                                                                                                                                                                                                                                                                       | Ensure that your table names don't contain spaces.                                          |
+| Table names CANNOT have punctuation marks and MUST contain valid UTF-8                                                            | Cloud Spanner DOES NOT support punctuation marks e.g. periods ".", question marks "?" in table names                                                                                                                                                                                                                                                    | Ensure that your table names don't contain punctuation marks.                               |
+| Index with fields length [add_index](https://apidock.com/rails/v5.2.3/ActiveRecord/ConnectionAdapters/SchemaStatements/add_index) | Cloud Spanner does not support index with fields length                                                                                                                                                                                                                                                                                                 | Ensure that your database definition does not include index definitions with field lengths. |
+| Only GoogleSQL-dialect databases                                                                                                  | Cloud Spanner supports both GoogleSQL- and PostgreSQL-dialect databases. This adapter only supports GoogleSQL-dialect databases. You can use the [PostgreSQL ActiveRecord provider in combination with PGAdapter](https://github.com/GoogleCloudPlatform/pgadapter/tree/postgresql-dialect/samples/ruby/activerecord) for Spanner PostgreSQL databases. |                                                                                             |
+| `rails dbconsole` is not supported.                                                                                               | The `rails dbconsole` is not supported for Spanner databases.                                                                                                                                                                                                                                                                                           |                                                                                             |
+
 
 ## Contributing
 

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/command_recorder_test.rb

@@ -13,9 +13,6 @@ module ActiveRecord
     class CommandRecorderTest < SpannerAdapter::TestCase
       include SpannerAdapter::Migration::TestHelper
 
-      VERSION_6_1_0 = Gem::Version.create "6.1.0"
-      VERSION_6_0_3 = Gem::Version.create "6.0.3"
-
       def setup
         skip_test_table_create!
         super
@@ -203,20 +200,12 @@ module ActiveRecord
 
       def test_invert_add_index
         remove = @recorder.inverse_of :add_index, [:table, [:one, :two]]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:remove_index, [:table, { column: [:one, :two] }]], remove
-        else
-          assert_equal [:remove_index, [:table, [:one, :two]], nil], remove
-        end
+        assert_equal [:remove_index, [:table, [:one, :two]], nil], remove
       end
 
       def test_invert_add_index_with_name
         remove = @recorder.inverse_of :add_index, [:table, [:one, :two], name: "new_index"]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:remove_index, [:table, { name: "new_index" }]], remove
-        else
-          assert_equal [:remove_index, [:table, [:one, :two], {:name=>"new_index"}], nil], remove
-        end
+        assert_equal [:remove_index, [:table, [:one, :two], {:name=>"new_index"}], nil], remove
       end
 
       def test_invert_remove_index
@@ -226,11 +215,7 @@ module ActiveRecord
 
       def test_invert_remove_index_with_options
         add = @recorder.inverse_of :remove_index, [:table, { column: :one }]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:add_index, [:table, :one, {} ]], add
-        else
-          assert_equal [:add_index, [:table, :one ]], add
-        end
+        assert_equal [:add_index, [:table, :one ]], add
       end
 
       def test_invert_remove_index_with_positional_column
@@ -250,11 +235,7 @@ module ActiveRecord
 
       def test_invert_remove_index_with_no_special_options
         add = @recorder.inverse_of :remove_index, [:table, { column: [:one, :two] }]
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert_equal [:add_index, [:table, [:one, :two], {}]], add
-        else
-          assert_equal [:add_index, [:table, [:one, :two]]], add
-        end
+        assert_equal [:add_index, [:table, [:one, :two]]], add
       end
 
       def test_invert_remove_index_with_no_column
@@ -315,11 +296,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, :people]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people], nil], enable
       end
 
       def test_invert_remove_foreign_key
@@ -329,11 +306,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key_with_column
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people, column: "owner_id"]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, column: "owner_id"]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people, column: "owner_id"], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people, column: "owner_id"], nil], enable
       end
 
       def test_invert_remove_foreign_key_with_column
@@ -343,11 +316,7 @@ module ActiveRecord
 
       def test_invert_add_foreign_key_with_column_and_name
         enable = @recorder.inverse_of :add_foreign_key, [:dogs, :people, column: "owner_id", name: "fk"]
-        if ActiveRecord.gem_version < VERSION_6_0_3
-          assert_equal [:remove_foreign_key, [:dogs, { name: "fk" }]], enable
-        else
-          assert_equal [:remove_foreign_key, [:dogs, :people, { column: "owner_id", name: "fk" }], nil], enable
-        end
+        assert_equal [:remove_foreign_key, [:dogs, :people, { column: "owner_id", name: "fk" }], nil], enable
       end
 
       def test_invert_remove_foreign_key_with_column_and_name

data/acceptance/cases/migration/references_index_test.rb

@@ -76,12 +76,7 @@ module ActiveRecord
             t.references :foo, polymorphic: true, index: true
           end
         end
-
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo_type_and_foo_id)
-        else
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
-        end
+        assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
       end
 
       def test_creates_index_for_existing_table
@@ -124,11 +119,7 @@ module ActiveRecord
           end
         end
 
-        if ActiveRecord::gem_version < Gem::Version.create('6.1.0')
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo_type_and_foo_id)
-        else
-          assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
-        end
+        assert connection.index_exists?(table_name, [:foo_type, :foo_id], name: :index_testings_on_foo)
       end
     end
   end