activerecord-spanner-adapter 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73df0f7ee319edb7461b0fa60f8f8b611b38d798de2c0caf20a9c7d6796a7a85
-  data.tar.gz: 9dedd540069c5bc85d458008c20e48b9b550a75388a1f4d48b1b29b34bb689d4
+  metadata.gz: 2ad2384bb1890bb224c89a146c42f615f89c6e2892848da5e701a091d90fa95b
+  data.tar.gz: 0e8a9c608068ff30011bc9bca68b10ab0d22b910260a37a6d4a492365adf78b0
 SHA512:
-  metadata.gz: faac93588f6e703f183a773caf553d61b64370439093ac27a7d1a4893f6d887c887fbf1be9082baf78bb81e2c23b24f45a1e4053672e386595ff95c0980a0c4b
-  data.tar.gz: 4d6061c3daf7760d3015a33b52a41354f6bafa21b594a0c2b44852ae928935e1b2e23421ce417de2e65eecdc56de0890d97d0321e07fd3a3c3c104cf56856c88
+  metadata.gz: 1894765bbc1e3dfac270d73199a4f235ae95724ca18145d6850cce27c38ef2018b59e9035cf2fa91bc30d3f650e080b8eea58c3e91a66035db3a4d07c35ca1be
+  data.tar.gz: 4a9b93d7990fa78f901864bed816e75ff5d0f9da34a530c7107f475d8fd06dc71817fbf8b2c1e0262e4656bf7ab363917ecf7b7c82315b6d5fa84cce0d22489d

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

@@ -19,7 +19,7 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["2.7", "3.0", "3.1", "3.2"]
-        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
+        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.0"

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

@@ -34,12 +34,14 @@ jobs:
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
+    - name: Authenticate Google Cloud
+      uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v0
+      uses: google-github-actions/setup-gcloud@v2
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
-        service_account_key: ${{ secrets.GCP_SA_KEY }}
-        export_default_credentials: true
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on production

data/.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["2.7", "3.0", "3.1", "3.2"]
-        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
+        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4", "~> 7.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.0"

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

@@ -20,7 +20,7 @@ jobs:
       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]
+        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]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0

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

@@ -20,12 +20,14 @@ jobs:
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}
+    - name: Authenticate Google Cloud
+      uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.GCP_SA_KEY }}
     - name: Setup GCloud
-      uses: google-github-actions/setup-gcloud@v0
+      uses: google-github-actions/setup-gcloud@v2
       with:
         project_id: ${{ secrets.GCP_PROJECT_ID }}
-        service_account_key: ${{ secrets.GCP_SA_KEY }}
-        export_default_credentials: true
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on production

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

@@ -12,7 +12,7 @@ jobs:
       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]
+        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]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ReleaseLabel
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.5.1"
+  ".": "1.6.0"
 }

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 1.6.0 (2023-12-20)
+
+#### Features
+
+* interleaved tables with built-in composite pk ([#282](https://github.com/googleapis/ruby-spanner-activerecord/issues/282)) 
+* support Query Logs ([#291](https://github.com/googleapis/ruby-spanner-activerecord/issues/291)) 
+* support Rails 7.1 ([#278](https://github.com/googleapis/ruby-spanner-activerecord/issues/278)) 
+
 ### 1.5.1 (2023-12-12)
 
 #### Bug Fixes

data/Gemfile

@@ -4,12 +4,15 @@ source "https://rubygems.org"
 gemspec
 
 gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.6.1")
-gem "minitest", "~> 5.19.0"
+gem "minitest", "~> 5.20.0"
+gem "minitest-rg", "~> 5.3.0"
 gem "pry", "~> 0.13.0"
 gem "pry-byebug", "~> 3.9.0"
 
 # Required for samples and testing.
-gem "composite_primary_keys"
+install_if -> { ENV.fetch("AR_VERSION", "~> 6.1.6.1").dup.to_s.sub!("~>", "").strip < "7.1.0" && !ENV["SKIP_COMPOSITE_PK"] } do
+  gem "composite_primary_keys"
+end
 
 # Required for samples
 gem "docker-api"

data/README.md

@@ -84,19 +84,19 @@ Some noteworthy examples in the snippets directory:
   for inserting, updating and deleting data in a Cloud Spanner database. Mutations can have a significant performance
   advantage compared to DML statements, but do not allow read-your-writes semantics during a transaction.
 - [array-data-type](examples/snippets/array-data-type): Shows how to work with `ARRAY` data types.
-- [interleaved-tables](examples/snippets/interleaved-tables): Shows how to work with [Interleaved Tables](https://cloud.google.com/spanner/docs/schema-and-data-model#create-interleaved-tables).
+- [interleaved-tables](examples/snippets/interleaved-tables-before-7.1): Shows how to work with [Interleaved Tables](https://cloud.google.com/spanner/docs/schema-and-data-model#create-interleaved-tables).
 
 ## 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 and auto-assigned IDs|Cloud Spanner doesn't autogenerate IDs and this integration instead creates UUID4 to avoid [hotspotting](https://cloud.google.com/spanner/docs/schema-design#uuid_primary_key) so you SHOULD NOT rely on IDs being sorted| UUID4s are automatically generated for 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.                                                                                                  | Ensure that your database uses the GoogleSQL dialect.                                       |
 
 ## Contributing
 

data/acceptance/cases/interleaved_associations/has_many_associations_using_interleaved_test.rb

@@ -6,6 +6,12 @@
 
 # frozen_string_literal: true
 
+# ActiveRecord 7.1 introduced native support for composite primary keys.
+# This deprecates the https://github.com/composite-primary-keys/composite_primary_keys gem that was previously used in
+# this library to support composite primary keys, which again are needed for interleaved tables. These tests use the
+# third-party composite primary key gem and are therefore not executed for Rails 7.1 and higher.
+return if ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
+
 require "test_helper"
 require "models/singer"
 require "models/album"

data/acceptance/cases/migration/change_schema_test.rb

@@ -196,8 +196,14 @@ module ActiveRecord
             end
           end
         end
+        expected = if ActiveRecord::gem_version < Gem::Version.create('7.1.0')
+          "you can't redefine the primary key column 'id'. To define a custom primary key, pass { id: false } to create_table."
+        else
+          "you can't redefine the primary key column 'id' on 'testings'. To define a custom primary key, pass { id: false } to create_table."
+        end
+
 
-        assert_equal "you can't redefine the primary key column 'id'. To define a custom primary key, pass { id: false } to create_table.", error.message
+        assert_equal expected, error.message
       end
 
       def test_create_table_raises_when_redefining_custom_primary_key_column
@@ -209,7 +215,12 @@ module ActiveRecord
           end
         end
 
-        assert_equal "you can't redefine the primary key column 'testing_id'. To define a custom primary key, pass { id: false } to create_table.", error.message
+        expected = if ActiveRecord::gem_version < Gem::Version.create('7.1.0')
+          "you can't redefine the primary key column 'testing_id'. To define a custom primary key, pass { id: false } to create_table."
+        else
+          "you can't redefine the primary key column 'testing_id' on 'testings'. To define a custom primary key, pass { id: false } to create_table."
+        end
+        assert_equal expected, error.message
       end
 
       def test_create_table_raises_when_defining_existing_column
@@ -222,7 +233,12 @@ module ActiveRecord
           end
         end
 
-        assert_equal "you can't define an already defined column 'testing_column'.", error.message
+        expected = if ActiveRecord::gem_version < Gem::Version.create('7.1.0')
+          "you can't define an already defined column 'testing_column'."
+        else
+          "you can't define an already defined column 'testing_column' on 'testings'."
+        end
+        assert_equal expected, error.message
       end
 
       def test_create_table_with_timestamps_should_create_datetime_columns

data/acceptance/cases/migration/schema_dumper_test.rb

@@ -13,6 +13,10 @@ module ActiveRecord
     class IndexTest < SpannerAdapter::TestCase
       include SpannerAdapter::Migration::TestHelper
 
+      def is_7_1_or_higher?
+        ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
+      end
+
       def test_dump_schema_contains_start_batch_ddl
         connection = ActiveRecord::Base.connection
         schema = StringIO.new
@@ -34,7 +38,12 @@ module ActiveRecord
         connection = ActiveRecord::Base.connection
         schema = StringIO.new
         ActiveRecord::SchemaDumper.dump connection, schema
-        assert schema.string.include?("create_table \"albums\", primary_key: \"albumid\"")
+        sql = schema.string
+        if is_7_1_or_higher?
+          assert schema.string.include?("create_table \"albums\", primary_key: [\"singerid\", \"albumid\"]"), sql
+        else
+          assert schema.string.include?("create_table \"albums\", primary_key: \"albumid\""), sql
+        end
       end
 
       def test_dump_schema_contains_interleaved_index

data/acceptance/cases/models/interleave_test.rb

@@ -6,6 +6,12 @@
 
 # frozen_string_literal: true
 
+# ActiveRecord 7.1 introduced native support for composite primary keys.
+# This deprecates the https://github.com/composite-primary-keys/composite_primary_keys gem that was previously used in
+# this library to support composite primary keys, which again are needed for interleaved tables. These tests use the
+# third-party composite primary key gem and are therefore not executed for Rails 7.1 and higher.
+return if ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
+
 require "test_helper"
 require "test_helpers/with_separate_database"
 

data/acceptance/cases/tasks/database_tasks_test.rb

@@ -14,6 +14,10 @@ module ActiveRecord
     class DatabaseTasksTest < SpannerAdapter::TestCase
       attr_reader :connector_config, :connection
 
+      def is_7_1_or_higher?
+        ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
+      end
+
       def setup
         @database_id = "ar-tasks-test-#{SecureRandom.hex 4}"
         @connector_config = {
@@ -87,8 +91,12 @@ module ActiveRecord
         end
         ActiveRecord::Tasks::DatabaseTasks.dump_schema db_config, :sql
         sql = File.read(filename)
-        if ENV["SPANNER_EMULATOR_HOST"]
+        if ENV["SPANNER_EMULATOR_HOST"] && is_7_1_or_higher?
+          assert_equal expected_schema_sql_on_emulator_7_1, sql, msg = sql
+        elsif ENV["SPANNER_EMULATOR_HOST"]
           assert_equal expected_schema_sql_on_emulator, sql, msg = sql
+        elsif is_7_1_or_higher?
+          assert_equal expected_schema_sql_on_production_7_1, sql, msg = sql
         else
           assert_equal expected_schema_sql_on_production, sql, msg = sql
         end
@@ -235,6 +243,168 @@ CREATE TABLE tracks (
 ) PRIMARY KEY(singerid, albumid, trackid),
   INTERLEAVE IN PARENT albums ON DELETE CASCADE;
 CREATE NULL_FILTERED INDEX index_tracks_on_singerid_and_albumid_and_title ON tracks(singerid, albumid, title), INTERLEAVE IN albums;
+CREATE TABLE table_with_sequence (
+  id INT64 NOT NULL DEFAULT (FARM_FINGERPRINT(GENERATE_UUID())),
+  name STRING(MAX) NOT NULL,
+  age INT64 NOT NULL,
+) PRIMARY KEY(id);
+CREATE TABLE schema_migrations (
+  version STRING(MAX) NOT NULL,
+) PRIMARY KEY(version);
+CREATE TABLE ar_internal_metadata (
+  key STRING(MAX) NOT NULL,
+  value STRING(MAX),
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL,
+) PRIMARY KEY(key);
+INSERT INTO `schema_migrations` (version) VALUES
+('1');
+
+"
+      end
+
+      def expected_schema_sql_on_emulator_7_1
+        "CREATE TABLE all_types (
+  id INT64 NOT NULL,
+  col_string STRING(MAX),
+  col_int64 INT64,
+  col_float64 FLOAT64,
+  col_numeric NUMERIC,
+  col_bool BOOL,
+  col_bytes BYTES(MAX),
+  col_date DATE,
+  col_timestamp TIMESTAMP,
+  col_json JSON,
+  col_array_string ARRAY<STRING(MAX)>,
+  col_array_int64 ARRAY<INT64>,
+  col_array_float64 ARRAY<FLOAT64>,
+  col_array_numeric ARRAY<NUMERIC>,
+  col_array_bool ARRAY<BOOL>,
+  col_array_bytes ARRAY<BYTES(MAX)>,
+  col_array_date ARRAY<DATE>,
+  col_array_timestamp ARRAY<TIMESTAMP>,
+  col_array_json ARRAY<JSON>,
+) PRIMARY KEY(id);
+CREATE TABLE firms (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  rating INT64,
+  description STRING(MAX),
+  account_id INT64,
+) PRIMARY KEY(id);
+CREATE INDEX index_firms_on_account_id ON firms(account_id);
+CREATE TABLE customers (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE accounts (
+  id INT64 NOT NULL,
+  customer_id INT64,
+  firm_id INT64,
+  name STRING(MAX),
+  credit_limit INT64,
+  transactions_count INT64,
+) PRIMARY KEY(id);
+CREATE TABLE transactions (
+  id INT64 NOT NULL,
+  amount FLOAT64,
+  account_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE departments (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  resource_type STRING(255),
+  resource_id INT64,
+) PRIMARY KEY(id);
+CREATE INDEX index_departments_on_resource ON departments(resource_type, resource_id);
+CREATE TABLE member_types (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE members (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  member_type_id INT64,
+  admittable_type STRING(255),
+  admittable_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE memberships (
+  id INT64 NOT NULL,
+  joined_on TIMESTAMP,
+  club_id INT64,
+  member_id INT64,
+  favourite BOOL,
+) PRIMARY KEY(id);
+CREATE TABLE clubs (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE authors (
+  id INT64 NOT NULL,
+  name STRING(MAX) NOT NULL,
+  registered_date DATE,
+  organization_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE posts (
+  id INT64 NOT NULL,
+  title STRING(MAX),
+  content STRING(MAX),
+  author_id INT64,
+  comments_count INT64,
+  post_date DATE,
+  published_time TIMESTAMP,
+) PRIMARY KEY(id);
+CREATE INDEX index_posts_on_author_id ON posts(author_id);
+CREATE TABLE comments (
+  id INT64 NOT NULL,
+  comment STRING(MAX),
+  post_id INT64,
+  CONSTRAINT fk_rails_2fd19c0db7 FOREIGN KEY(post_id) REFERENCES posts(id),
+) PRIMARY KEY(id);
+CREATE TABLE addresses (
+  id INT64 NOT NULL,
+  line1 STRING(MAX),
+  postal_code STRING(MAX),
+  city STRING(MAX),
+  author_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE organizations (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  last_updated TIMESTAMP OPTIONS (
+    allow_commit_timestamp = true
+  ),
+) PRIMARY KEY(id);
+CREATE TABLE singers (
+  singerid INT64 NOT NULL,
+  first_name STRING(200),
+  last_name STRING(MAX),
+  tracks_count INT64,
+  lock_version INT64,
+  full_name STRING(MAX) AS (COALESCE(first_name || ' ', '') || last_name) STORED,
+) PRIMARY KEY(singerid);
+CREATE TABLE albums (
+  singerid INT64 NOT NULL,
+  albumid INT64 NOT NULL,
+  title STRING(MAX),
+  lock_version INT64,
+) PRIMARY KEY(singerid, albumid),
+  INTERLEAVE IN PARENT singers ON DELETE NO ACTION;
+CREATE TABLE tracks (
+  singerid INT64 NOT NULL,
+  albumid INT64 NOT NULL,
+  trackid INT64 NOT NULL,
+  title STRING(MAX),
+  duration NUMERIC,
+  lock_version INT64,
+) PRIMARY KEY(singerid, albumid, trackid),
+  INTERLEAVE IN PARENT albums ON DELETE CASCADE;
+CREATE NULL_FILTERED INDEX index_tracks_on_singerid_and_albumid_and_title ON tracks(singerid, albumid, title), INTERLEAVE IN albums;
+CREATE TABLE table_with_sequence (
+  id INT64 NOT NULL DEFAULT (FARM_FINGERPRINT(GENERATE_UUID())),
+  name STRING(MAX) NOT NULL,
+  age INT64 NOT NULL,
+) PRIMARY KEY(id);
 CREATE TABLE schema_migrations (
   version STRING(MAX) NOT NULL,
 ) PRIMARY KEY(version);
@@ -251,7 +421,10 @@ INSERT INTO `schema_migrations` (version) VALUES
       end
 
       def expected_schema_sql_on_production
-        "CREATE TABLE accounts (
+        "CREATE SEQUENCE test_sequence OPTIONS (
+  sequence_kind = 'bit_reversed_positive'
+);
+CREATE TABLE accounts (
   id INT64 NOT NULL,
   customer_id INT64,
   firm_id INT64,
@@ -391,6 +564,171 @@ CREATE TABLE tracks (
 ) PRIMARY KEY(singerid, albumid, trackid),
   INTERLEAVE IN PARENT albums ON DELETE CASCADE;
 CREATE NULL_FILTERED INDEX index_tracks_on_singerid_and_albumid_and_title ON tracks(singerid, albumid, title), INTERLEAVE IN albums;
+CREATE TABLE table_with_sequence (
+  id INT64 NOT NULL DEFAULT (GET_NEXT_SEQUENCE_VALUE(SEQUENCE test_sequence)),
+  name STRING(MAX) NOT NULL,
+  age INT64 NOT NULL,
+) PRIMARY KEY(id);
+CREATE TABLE transactions (
+  id INT64 NOT NULL,
+  amount FLOAT64,
+  account_id INT64,
+) PRIMARY KEY(id);
+INSERT INTO `schema_migrations` (version) VALUES
+('1');
+
+"
+      end
+
+      def expected_schema_sql_on_production_7_1
+        "CREATE SEQUENCE test_sequence OPTIONS (
+  sequence_kind = 'bit_reversed_positive'
+);
+CREATE TABLE accounts (
+  id INT64 NOT NULL,
+  customer_id INT64,
+  firm_id INT64,
+  name STRING(MAX),
+  credit_limit INT64,
+  transactions_count INT64,
+) PRIMARY KEY(id);
+CREATE TABLE addresses (
+  id INT64 NOT NULL,
+  line1 STRING(MAX),
+  postal_code STRING(MAX),
+  city STRING(MAX),
+  author_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE all_types (
+  id INT64 NOT NULL,
+  col_string STRING(MAX),
+  col_int64 INT64,
+  col_float64 FLOAT64,
+  col_numeric NUMERIC,
+  col_bool BOOL,
+  col_bytes BYTES(MAX),
+  col_date DATE,
+  col_timestamp TIMESTAMP,
+  col_json JSON,
+  col_array_string ARRAY<STRING(MAX)>,
+  col_array_int64 ARRAY<INT64>,
+  col_array_float64 ARRAY<FLOAT64>,
+  col_array_numeric ARRAY<NUMERIC>,
+  col_array_bool ARRAY<BOOL>,
+  col_array_bytes ARRAY<BYTES(MAX)>,
+  col_array_date ARRAY<DATE>,
+  col_array_timestamp ARRAY<TIMESTAMP>,
+  col_array_json ARRAY<JSON>,
+) PRIMARY KEY(id);
+CREATE TABLE ar_internal_metadata (
+  key STRING(MAX) NOT NULL,
+  value STRING(MAX),
+  created_at TIMESTAMP NOT NULL,
+  updated_at TIMESTAMP NOT NULL,
+) PRIMARY KEY(key);
+CREATE TABLE authors (
+  id INT64 NOT NULL,
+  name STRING(MAX) NOT NULL,
+  registered_date DATE,
+  organization_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE clubs (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE comments (
+  id INT64 NOT NULL,
+  comment STRING(MAX),
+  post_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE customers (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE departments (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  resource_type STRING(255),
+  resource_id INT64,
+) PRIMARY KEY(id);
+CREATE INDEX index_departments_on_resource ON departments(resource_type, resource_id);
+CREATE TABLE firms (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  rating INT64,
+  description STRING(MAX),
+  account_id INT64,
+) PRIMARY KEY(id);
+CREATE INDEX index_firms_on_account_id ON firms(account_id);
+CREATE TABLE member_types (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+) PRIMARY KEY(id);
+CREATE TABLE members (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  member_type_id INT64,
+  admittable_type STRING(255),
+  admittable_id INT64,
+) PRIMARY KEY(id);
+CREATE TABLE memberships (
+  id INT64 NOT NULL,
+  joined_on TIMESTAMP,
+  club_id INT64,
+  member_id INT64,
+  favourite BOOL,
+) PRIMARY KEY(id);
+CREATE TABLE organizations (
+  id INT64 NOT NULL,
+  name STRING(MAX),
+  last_updated TIMESTAMP OPTIONS (
+    allow_commit_timestamp = true
+  ),
+) PRIMARY KEY(id);
+CREATE TABLE posts (
+  id INT64 NOT NULL,
+  title STRING(MAX),
+  content STRING(MAX),
+  author_id INT64,
+  comments_count INT64,
+  post_date DATE,
+  published_time TIMESTAMP,
+) PRIMARY KEY(id);
+ALTER TABLE comments ADD CONSTRAINT fk_rails_2fd19c0db7 FOREIGN KEY(post_id) REFERENCES posts(id);
+CREATE INDEX index_posts_on_author_id ON posts(author_id);
+CREATE TABLE schema_migrations (
+  version STRING(MAX) NOT NULL,
+) PRIMARY KEY(version);
+CREATE TABLE singers (
+  singerid INT64 NOT NULL,
+  first_name STRING(200),
+  last_name STRING(MAX),
+  tracks_count INT64,
+  lock_version INT64,
+  full_name STRING(MAX) AS (COALESCE(first_name || ' ', '') || last_name) STORED,
+) PRIMARY KEY(singerid);
+CREATE TABLE albums (
+  singerid INT64 NOT NULL,
+  albumid INT64 NOT NULL,
+  title STRING(MAX),
+  lock_version INT64,
+) PRIMARY KEY(singerid, albumid),
+  INTERLEAVE IN PARENT singers ON DELETE NO ACTION;
+CREATE TABLE tracks (
+  singerid INT64 NOT NULL,
+  albumid INT64 NOT NULL,
+  trackid INT64 NOT NULL,
+  title STRING(MAX),
+  duration NUMERIC,
+  lock_version INT64,
+) PRIMARY KEY(singerid, albumid, trackid),
+  INTERLEAVE IN PARENT albums ON DELETE CASCADE;
+CREATE NULL_FILTERED INDEX index_tracks_on_singerid_and_albumid_and_title ON tracks(singerid, albumid, title), INTERLEAVE IN albums;
+CREATE TABLE table_with_sequence (
+  id INT64 NOT NULL DEFAULT (GET_NEXT_SEQUENCE_VALUE(SEQUENCE test_sequence)),
+  name STRING(MAX) NOT NULL,
+  age INT64 NOT NULL,
+) PRIMARY KEY(id);
 CREATE TABLE transactions (
   id INT64 NOT NULL,
   amount FLOAT64,

data/acceptance/cases/transactions/optimistic_locking_test.rb

@@ -6,6 +6,12 @@
 
 # frozen_string_literal: true
 
+# ActiveRecord 7.1 introduced native support for composite primary keys.
+# This deprecates the https://github.com/composite-primary-keys/composite_primary_keys gem that was previously used in
+# this library to support composite primary keys, which again are needed for interleaved tables. These tests use the
+# third-party composite primary key gem and are therefore not executed for Rails 7.1 and higher.
+return if ActiveRecord::gem_version >= Gem::Version.create('7.1.0')
+
 require "test_helper"
 require "models/singer"
 require "models/album"