support rails 7.1.beta1

rgeo · Sep 17, 2023 · e109a8a · e109a8a
1 parent f2bb31b
commit e109a8a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/activerecord-postgis-adapter.gemspec b/activerecord-postgis-adapter.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "activerecord", "~> 7.0.0"
+  spec.add_dependency "activerecord", "~> 7.1.beta1"
   spec.add_dependency "rgeo-activerecord", "~> 7.0.0"
 
   spec.add_development_dependency "rake", "~> 13.0"

diff --git a/lib/active_record/connection_adapters/postgis/schema_statements.rb b/lib/active_record/connection_adapters/postgis/schema_statements.rb
@@ -13,7 +13,7 @@ def new_column_from_field(table_name, field)
           default_value = extract_value_from_default(default)
           default_function = extract_default_function(default_value, default)
 
-          if match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/)
+          if (match = default_function&.match(/\Anextval\('"?(?<sequence_name>.+_(?<suffix>seq\d*))"?'::regclass\)\z/))
             serial = sequence_name_from_parts(table_name, column_name, match[:suffix]) == match[:sequence_name]
           end
 

diff --git a/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb b/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:

diff --git a/lib/active_record/connection_adapters/postgis/version.rb b/lib/active_record/connection_adapters/postgis/version.rb
@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "8.0.2"
+      VERSION = "9.0.0"
     end
   end
 end
diff --git a/lib/active_record/connection_adapters/postgis_adapter.rb b/lib/active_record/connection_adapters/postgis_adapter.rb
@@ -9,18 +9,18 @@
 
 require "active_record/connection_adapters"
 require "active_record/connection_adapters/postgresql_adapter"
-require "active_record/connection_adapters/postgis/version"
-require "active_record/connection_adapters/postgis/column_methods"
-require "active_record/connection_adapters/postgis/schema_statements"
-require "active_record/connection_adapters/postgis/database_statements"
-require "active_record/connection_adapters/postgis/spatial_column_info"
-require "active_record/connection_adapters/postgis/spatial_table_definition"
-require "active_record/connection_adapters/postgis/spatial_column"
-require "active_record/connection_adapters/postgis/arel_tosql"
-require "active_record/connection_adapters/postgis/oid/spatial"
-require "active_record/connection_adapters/postgis/oid/date_time"
-require "active_record/connection_adapters/postgis/type" # has to be after oid/*
-require "active_record/connection_adapters/postgis/create_connection"
+require_relative "postgis/version"
+require_relative "postgis/column_methods"
+require_relative "postgis/schema_statements"
+require_relative "postgis/database_statements"
+require_relative "postgis/spatial_column_info"
+require_relative "postgis/spatial_table_definition"
+require_relative "postgis/spatial_column"
+require_relative "postgis/arel_tosql"
+require_relative "postgis/oid/spatial"
+require_relative "postgis/oid/date_time"
+require_relative "postgis/type" # has to be after oid/*
+require_relative "postgis/create_connection"
 # :startdoc:
 
 module ActiveRecord