activerecord-spanner-adapter 2.0.0 → 2.1.0

data/acceptance/cases/tasks/database_tasks_test.rb

@@ -26,7 +26,8 @@ module ActiveRecord
           "project" => ENV["SPANNER_TEST_PROJECT"],
           "instance" => ENV["SPANNER_TEST_INSTANCE"],
           "credentials" => ENV["SPANNER_TEST_KEYFILE"],
-          "database" => @database_id
+          "database" => @database_id,
+          "default_sequence_kind" => "BIT_REVERSED_POSITIVE",
         }
 
         create_database
@@ -74,13 +75,9 @@ module ActiveRecord
         create_tables_in_test_schema
 
         db_config =
-          if ActiveRecord.version >= Gem::Version.new("6.1")
-            ActiveRecord::DatabaseConfigurations::HashConfig.new "test",
-                                                                 "primary",
-                                                                 connector_config
-          else
-            connector_config
-          end
+          ActiveRecord::DatabaseConfigurations::HashConfig.new "test",
+                                                               "primary",
+                                                               connector_config
 
         tables = connection.tables.sort
         config_name = "primary"
@@ -109,7 +106,7 @@ module ActiveRecord
 
       def expected_schema_sql_on_emulator
         "CREATE TABLE all_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   col_string STRING(MAX),
   col_int64 INT64,
   col_float64 FLOAT64,
@@ -130,7 +127,7 @@ module ActiveRecord
   col_array_json ARRAY<JSON>,
 ) PRIMARY KEY(id);
 CREATE TABLE firms (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   rating INT64,
   description STRING(MAX),
@@ -138,11 +135,11 @@ CREATE TABLE firms (
 ) PRIMARY KEY(id);
 CREATE INDEX index_firms_on_account_id ON firms(account_id);
 CREATE TABLE customers (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE accounts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   customer_id INT64,
   firm_id INT64,
   name STRING(MAX),
@@ -150,47 +147,47 @@ CREATE TABLE accounts (
   transactions_count INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE transactions (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   amount FLOAT64,
   account_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE departments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE members (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   member_type_id INT64,
   admittable_type STRING(255),
   admittable_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE memberships (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   joined_on TIMESTAMP,
   club_id INT64,
   member_id INT64,
   favourite BOOL,
 ) PRIMARY KEY(id);
 CREATE TABLE clubs (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE authors (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX) NOT NULL,
   registered_date DATE,
   organization_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE posts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   title STRING(MAX),
   content STRING(MAX),
   author_id INT64,
@@ -200,27 +197,27 @@ CREATE TABLE posts (
 ) PRIMARY KEY(id);
 CREATE INDEX index_posts_on_author_id ON posts(author_id);
 CREATE TABLE comments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   line1 STRING(MAX),
   postal_code STRING(MAX),
   city STRING(MAX),
   author_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE organizations (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   last_updated TIMESTAMP OPTIONS (
     allow_commit_timestamp = true
   ),
 ) PRIMARY KEY(id);
 CREATE TABLE singers (
-  singerid INT64 NOT NULL,
+  singerid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   first_name STRING(200),
   last_name STRING(MAX),
   tracks_count INT64,
@@ -229,14 +226,14 @@ CREATE TABLE singers (
 ) PRIMARY KEY(singerid);
 CREATE INDEX index_singers_on_last_name ON singers(last_name) STORING (tracks_count, first_name);
 CREATE TABLE albums (
-  albumid INT64 NOT NULL,
+  albumid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   singerid INT64 NOT NULL,
   title STRING(MAX),
   lock_version INT64,
 ) PRIMARY KEY(singerid, albumid),
   INTERLEAVE IN PARENT singers ON DELETE NO ACTION;
 CREATE TABLE tracks (
-  trackid INT64 NOT NULL,
+  trackid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   singerid INT64 NOT NULL,
   albumid INT64 NOT NULL,
   title STRING(MAX),
@@ -267,7 +264,7 @@ INSERT INTO `schema_migrations` (version) VALUES
 
       def expected_schema_sql_on_emulator_7_1
         "CREATE TABLE all_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   col_string STRING(MAX),
   col_int64 INT64,
   col_float64 FLOAT64,
@@ -288,7 +285,7 @@ INSERT INTO `schema_migrations` (version) VALUES
   col_array_json ARRAY<JSON>,
 ) PRIMARY KEY(id);
 CREATE TABLE firms (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   rating INT64,
   description STRING(MAX),
@@ -296,11 +293,11 @@ CREATE TABLE firms (
 ) PRIMARY KEY(id);
 CREATE INDEX index_firms_on_account_id ON firms(account_id);
 CREATE TABLE customers (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE accounts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   customer_id INT64,
   firm_id INT64,
   name STRING(MAX),
@@ -308,47 +305,47 @@ CREATE TABLE accounts (
   transactions_count INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE transactions (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   amount FLOAT64,
   account_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE departments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE members (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   member_type_id INT64,
   admittable_type STRING(255),
   admittable_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE memberships (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   joined_on TIMESTAMP,
   club_id INT64,
   member_id INT64,
   favourite BOOL,
 ) PRIMARY KEY(id);
 CREATE TABLE clubs (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE authors (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX) NOT NULL,
   registered_date DATE,
   organization_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE posts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   title STRING(MAX),
   content STRING(MAX),
   author_id INT64,
@@ -358,27 +355,27 @@ CREATE TABLE posts (
 ) PRIMARY KEY(id);
 CREATE INDEX index_posts_on_author_id ON posts(author_id);
 CREATE TABLE comments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   line1 STRING(MAX),
   postal_code STRING(MAX),
   city STRING(MAX),
   author_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE organizations (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   last_updated TIMESTAMP OPTIONS (
     allow_commit_timestamp = true
   ),
 ) PRIMARY KEY(id);
 CREATE TABLE singers (
-  singerid INT64 NOT NULL,
+  singerid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   first_name STRING(200),
   last_name STRING(MAX),
   tracks_count INT64,
@@ -428,7 +425,7 @@ INSERT INTO `schema_migrations` (version) VALUES
   sequence_kind = 'bit_reversed_positive'
 );
 CREATE TABLE accounts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   customer_id INT64,
   firm_id INT64,
   name STRING(MAX),
@@ -436,14 +433,14 @@ CREATE TABLE accounts (
   transactions_count INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE addresses (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   line1 STRING(MAX),
   postal_code STRING(MAX),
   city STRING(MAX),
   author_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE all_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   col_string STRING(MAX),
   col_int64 INT64,
   col_float64 FLOAT64,
@@ -470,33 +467,33 @@ CREATE TABLE ar_internal_metadata (
   updated_at TIMESTAMP NOT NULL,
 ) PRIMARY KEY(key);
 CREATE TABLE authors (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX) NOT NULL,
   registered_date DATE,
   organization_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE clubs (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE comments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   comment STRING(MAX),
   post_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE customers (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE departments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   rating INT64,
   description STRING(MAX),
@@ -504,32 +501,32 @@ CREATE TABLE firms (
 ) PRIMARY KEY(id);
 CREATE INDEX index_firms_on_account_id ON firms(account_id);
 CREATE TABLE member_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE members (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   member_type_id INT64,
   admittable_type STRING(255),
   admittable_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE memberships (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   joined_on TIMESTAMP,
   club_id INT64,
   member_id INT64,
   favourite BOOL,
 ) PRIMARY KEY(id);
 CREATE TABLE organizations (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   last_updated TIMESTAMP OPTIONS (
     allow_commit_timestamp = true
   ),
 ) PRIMARY KEY(id);
 CREATE TABLE posts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   title STRING(MAX),
   content STRING(MAX),
   author_id INT64,
@@ -543,7 +540,7 @@ CREATE TABLE schema_migrations (
   version STRING(MAX) NOT NULL,
 ) PRIMARY KEY(version);
 CREATE TABLE singers (
-  singerid INT64 NOT NULL,
+  singerid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   first_name STRING(200),
   last_name STRING(MAX),
   tracks_count INT64,
@@ -574,7 +571,7 @@ CREATE TABLE table_with_sequence (
   age INT64 NOT NULL,
 ) PRIMARY KEY(id);
 CREATE TABLE transactions (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   amount FLOAT64,
   account_id INT64,
 ) PRIMARY KEY(id);
@@ -589,7 +586,7 @@ INSERT INTO `schema_migrations` (version) VALUES
   sequence_kind = 'bit_reversed_positive'
 );
 CREATE TABLE accounts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   customer_id INT64,
   firm_id INT64,
   name STRING(MAX),
@@ -597,14 +594,14 @@ CREATE TABLE accounts (
   transactions_count INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE addresses (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   line1 STRING(MAX),
   postal_code STRING(MAX),
   city STRING(MAX),
   author_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE all_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   col_string STRING(MAX),
   col_int64 INT64,
   col_float64 FLOAT64,
@@ -631,33 +628,33 @@ CREATE TABLE ar_internal_metadata (
   updated_at TIMESTAMP NOT NULL,
 ) PRIMARY KEY(key);
 CREATE TABLE authors (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX) NOT NULL,
   registered_date DATE,
   organization_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE clubs (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE comments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   comment STRING(MAX),
   post_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE customers (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE departments (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   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,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   rating INT64,
   description STRING(MAX),
@@ -665,32 +662,32 @@ CREATE TABLE firms (
 ) PRIMARY KEY(id);
 CREATE INDEX index_firms_on_account_id ON firms(account_id);
 CREATE TABLE member_types (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
 ) PRIMARY KEY(id);
 CREATE TABLE members (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   member_type_id INT64,
   admittable_type STRING(255),
   admittable_id INT64,
 ) PRIMARY KEY(id);
 CREATE TABLE memberships (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   joined_on TIMESTAMP,
   club_id INT64,
   member_id INT64,
   favourite BOOL,
 ) PRIMARY KEY(id);
 CREATE TABLE organizations (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   name STRING(MAX),
   last_updated TIMESTAMP OPTIONS (
     allow_commit_timestamp = true
   ),
 ) PRIMARY KEY(id);
 CREATE TABLE posts (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   title STRING(MAX),
   content STRING(MAX),
   author_id INT64,
@@ -704,7 +701,7 @@ CREATE TABLE schema_migrations (
   version STRING(MAX) NOT NULL,
 ) PRIMARY KEY(version);
 CREATE TABLE singers (
-  singerid INT64 NOT NULL,
+  singerid INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   first_name STRING(200),
   last_name STRING(MAX),
   tracks_count INT64,
@@ -735,7 +732,7 @@ CREATE TABLE table_with_sequence (
   age INT64 NOT NULL,
 ) PRIMARY KEY(id);
 CREATE TABLE transactions (
-  id INT64 NOT NULL,
+  id INT64 NOT NULL GENERATED BY DEFAULT AS IDENTITY (BIT_REVERSED_POSITIVE),
   amount FLOAT64,
   account_id INT64,
 ) PRIMARY KEY(id);

data/acceptance/cases/transactions/read_write_transactions_test.rb

@@ -260,12 +260,18 @@ module ActiveRecord
       end
 
       def test_create_record_with_sequence_using_mutations
-        err = assert_raises ActiveRecord::StatementInvalid do
-          TableWithSequence.transaction isolation: :buffered_mutations do
-            TableWithSequence.create name: "Foo", age: 50
+        reset_value = TableWithSequence.connection.use_client_side_id_for_mutations
+        begin
+          TableWithSequence.connection.use_client_side_id_for_mutations = false
+          err = assert_raises ActiveRecord::StatementInvalid do
+            TableWithSequence.transaction isolation: :buffered_mutations do
+              TableWithSequence.create name: "Foo", age: 50
+            end
           end
+          assert_equal "Mutations cannot be used to create records that use an auto-generated primary key.", err.message
+        ensure
+          TableWithSequence.connection.use_client_side_id_for_mutations = reset_value
         end
-        assert_equal "Mutations cannot be used to create records that use a sequence to generate the primary key. TableWithSequence uses test_sequence.", err.message
       end
     end
   end

data/acceptance/test_helper.rb

@@ -27,14 +27,27 @@ end
 $spanner_test_database = "ar-test-#{SecureRandom.hex 4}"
 
 def connector_config
-  {
-    "adapter" => "spanner",
-    "emulator_host" => ENV["SPANNER_EMULATOR_HOST"],
-    "project" => ENV["SPANNER_TEST_PROJECT"],
-    "instance" => ENV["SPANNER_TEST_INSTANCE"],
-    "credentials" => ENV["SPANNER_TEST_KEYFILE"],
-    "database" => $spanner_test_database
-  }
+  if ActiveRecord.gem_version >= Gem::Version.create("7.1.0")
+    {
+      "adapter" => "spanner",
+      "emulator_host" => ENV["SPANNER_EMULATOR_HOST"],
+      "project" => ENV["SPANNER_TEST_PROJECT"],
+      "instance" => ENV["SPANNER_TEST_INSTANCE"],
+      "credentials" => ENV["SPANNER_TEST_KEYFILE"],
+      "database" => $spanner_test_database,
+      "default_sequence_kind" => "BIT_REVERSED_POSITIVE",
+      "use_client_side_id_for_mutations" => true,
+    }
+  else
+    {
+      "adapter" => "spanner",
+      "emulator_host" => ENV["SPANNER_EMULATOR_HOST"],
+      "project" => ENV["SPANNER_TEST_PROJECT"],
+      "instance" => ENV["SPANNER_TEST_INSTANCE"],
+      "credentials" => ENV["SPANNER_TEST_KEYFILE"],
+      "database" => $spanner_test_database,
+    }
+  end
 end
 
 def spanner

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.1", "< 9"]
+  spec.add_runtime_dependency "activerecord", [">= 7.0", "< 9"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
   spec.add_development_dependency "bundler", "~> 2.0"

data/examples/snippets/Rakefile

@@ -32,6 +32,7 @@ task :all do
   samples.delete "interleaved-tables" if less_than_7_1
   samples.delete "interleaved-tables-before-7.1" unless less_than_7_1
   samples.delete "bit-reversed-sequence" if less_than_7_1
+  samples.delete "auto-generated-primary-key" if less_than_7_1
   samples.delete "query-logs" if less_than_7_1
   samples.each do |sample|
     run_sample sample