feat: support ActiveRecord 8.1.x

Adds support for ActiveRecord 8.1.x.

Author: olavloite

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

@@ -19,11 +19,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"

.github/workflows/ci.yaml

@@ -11,11 +11,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"

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

@@ -19,11 +19,13 @@ jobs:
       max-parallel: 4
       matrix:
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"

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

@@ -12,11 +12,13 @@ jobs:
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
         ruby: ["3.1", "3.2", "3.3", "3.4"]
-        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0"]
+        ar: ["~> 7.0.0", "~> 7.1.0", "~> 7.2.0", "~> 8.0.0", "~> 8.1.0"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.1"
             ar: "~> 8.0.0"
+          - ruby: "3.1"
+            ar: "~> 8.1.0"
           - ruby: "3.4"
             ar: "~> 7.0.0"
           - ruby: "3.4"

Gemfile

@@ -3,11 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-spanner.gemspec
 gemspec
 
-ar_version = ENV.fetch("AR_VERSION", "~> 7.1.0")
+ar_version = ENV.fetch("AR_VERSION", "~> 8.1.0")
 gem "activerecord", ar_version
 gem "ostruct"
 gem "minitest", "~> 5.27.0"
-gem "minitest-rg", "~> 5.3.0"
+gem "minitest-rg", "~> 5.4.0"
 gem "pry", "~> 0.14.2"
 gem "pry-byebug", "~> 3.11.0"
 gem "mutex_m"

acceptance/cases/migration/index_test.rb

@@ -57,7 +57,7 @@ def test_rename_index_too_long
         e = assert_raises(ArgumentError) {
           connection.rename_index(table_name, "old_idx", too_long_index_name)
         }
-        assert_match(/too long; the limit is #{connection.index_name_length} characters/, e.message)
+        assert_match(/too long/, e.message)
 
         assert connection.index_name_exists?(table_name, "old_idx")
       end
@@ -79,7 +79,7 @@ def test_add_index_does_not_accept_too_long_index_names
         e = assert_raises(ArgumentError) {
           connection.add_index(table_name, "foo", name: too_long_index_name)
         }
-        assert_match(/too long; the limit is #{connection.index_name_length} characters/, e.message)
+        assert_match(/too long/, e.message)
 
         assert_not connection.index_name_exists?(table_name, too_long_index_name)
         connection.add_index(table_name, "foo", name: good_index_name)

activerecord-spanner-adapter.gemspec

@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", [">= 7.0", "< 9"]
 
   spec.add_development_dependency "autotest-suffix", "~> 1.1"
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", [">= 2.0", "< 5.0"]
   spec.add_development_dependency "google-style", "~> 1.31.0"
   spec.add_development_dependency "minitest", "~> 5.10"
   spec.add_development_dependency "minitest-autotest", "~> 1.0"
   spec.add_development_dependency "minitest-focus", "~> 1.1"
-  spec.add_development_dependency "minitest-rg", "~> 5.2"
+  spec.add_development_dependency "minitest-rg", "~> 5.4"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "redcarpet", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.9"

lib/active_record/connection_adapters/spanner/column.rb

@@ -10,13 +10,26 @@ module ActiveRecord
   module ConnectionAdapters
     module Spanner
       class Column < ConnectionAdapters::Column
-        # rubocop:disable Style/OptionalBooleanParameter
-        def initialize(name, default, sql_type_metadata = nil, null = true,
-                       default_function = nil, collation: nil, comment: nil,
-                       primary_key: false, **)
-          # rubocop:enable Style/OptionalBooleanParameter
-          super
-          @primary_key = primary_key
+        VERSION_8_1 = Gem::Version.create "8.1.0"
+
+        if ActiveRecord.gem_version < VERSION_8_1
+          # rubocop:disable Style/OptionalBooleanParameter
+          def initialize(name, default, sql_type_metadata = nil, null = true,
+                         default_function = nil, collation: nil, comment: nil,
+                         primary_key: false, **)
+            # rubocop:enable Style/OptionalBooleanParameter
+            super
+            @primary_key = primary_key
+          end
+        else
+          # rubocop:disable Style/OptionalBooleanParameter
+          def initialize(name, cast_type, default, sql_type_metadata = nil, null = true,
+                         default_function = nil, collation: nil, comment: nil,
+                         primary_key: false, **)
+            # rubocop:enable Style/OptionalBooleanParameter
+            super
+            @primary_key = primary_key
+          end
         end
 
         def auto_incremented_by_db?

lib/active_record/connection_adapters/spanner/schema_creation.rb

@@ -138,7 +138,11 @@ def add_column_options! column, sql, options
             sql << " NOT NULL"
           end
           if options.key? :default
-            sql << " DEFAULT (#{quote_default_expression options[:default], column})"
+            sql << if respond_to? :quote_default_expression_for_column_definition, :include_private
+                     " DEFAULT (#{quote_default_expression_for_column_definition options[:default], column})"
+                   else
+                     " DEFAULT (#{quote_default_expression options[:default], column})"
+                   end
           elsif column.type == :primary_key
             if @connection.use_auto_increment?
               sql << " AUTO_INCREMENT"

lib/active_record/connection_adapters/spanner/schema_statements.rb

@@ -22,6 +22,7 @@ module Spanner
       #
       module SchemaStatements
         VERSION_7_2 = Gem::Version.create "7.2.0"
+        VERSION_8_1 = Gem::Version.create "8.1.0"
 
         def current_database
           @connection.database_id
@@ -116,18 +117,37 @@ def column_definitions table_name
           information_schema { |i| i.table_columns table_name }
         end
 
-        def new_column_from_field _table_name, field, _definitions = nil
-          Spanner::Column.new \
-            field.name,
-            field.default,
-            fetch_type_metadata(field.spanner_type,
-                                field.ordinal_position,
-                                field.allow_commit_timestamp,
-                                field.generated,
-                                is_identity: field.is_identity),
-            field.nullable,
-            field.default_function,
-            primary_key: field.primary_key
+        if ActiveRecord.gem_version < VERSION_8_1
+          def new_column_from_field _table_name, field, _definitions = nil
+            Spanner::Column.new \
+              field.name,
+              field.default,
+              fetch_type_metadata(field.spanner_type,
+                                  field.ordinal_position,
+                                  field.allow_commit_timestamp,
+                                  field.generated,
+                                  is_identity: field.is_identity),
+              field.nullable,
+              field.default_function,
+              primary_key: field.primary_key
+          end
+        else
+          def new_column_from_field _table_name, field, _definitions = nil
+            cast_type = type_map.lookup field.type
+            raise ArgumentError, "unknown type: `#{field.type}`" if cast_type.nil?
+            Spanner::Column.new \
+              field.name,
+              cast_type,
+              field.default,
+              fetch_type_metadata(field.spanner_type,
+                                  field.ordinal_position,
+                                  field.allow_commit_timestamp,
+                                  field.generated,
+                                  is_identity: field.is_identity),
+              field.nullable,
+              field.default_function,
+              primary_key: field.primary_key
+          end
         end
 
         def fetch_type_metadata sql_type, ordinal_position = nil, allow_commit_timestamp = nil, generated = nil,