Support ActiveRecord 7.1

stadia · Sep 4, 2024 · 3a04013 · 3a04013
1 parent 6ef5a21
commit 3a04013
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         ruby: ['3.0', '2.7']
         gemfile:
-          - gemfiles/ar70.gemfile
+          - gemfiles/ar71.gemfile
         mysql: ['5.7', '8.0']
     steps:
       - name: Set Up Actions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -13,7 +13,7 @@
 Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
-    - 'gemfiles/ar70.gemfile'
+    - 'gemfiles/ar71.gemfile'
 
 # Offense count: 2
 # Cop supports --auto-correct.

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
   - jruby-9.2.6.0
   - 3.0
 gemfile:
-  - gemfiles/ar70.gemfile
+  - gemfiles/ar71.gemfile
 matrix:
   allow_failures:
     - rvm: jruby-9.2.6.0
@@ -36,4 +36,4 @@ after_script:
   - ./cc-test-reporter after-build -t simplecov --exit-code $TRAVIS_TEST_RESULT
 before_install:
   - gem update --system
-  - gem install bundler
+  - gem install bundler
diff --git a/Appraisals b/Appraisals
@@ -1,3 +1,3 @@
-appraise "ar70" do
-  gem "activerecord", "~> 7.0.0"
+appraise "ar71" do
+  gem "activerecord", "~> 7.1.0"
 end
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -41,8 +41,8 @@ Run tests against the test gemfiles:
 run `rake appraisal` or run the tests manually:
 
 ```
-BUNDLE_GEMFILE=./gemfiles/ar70.gemfile bundle
-BUNDLE_GEMFILE=./gemfiles/ar70.gemfile rake
+BUNDLE_GEMFILE=./gemfiles/ar71.gemfile bundle
+BUNDLE_GEMFILE=./gemfiles/ar71.gemfile rake
 ```
 
 Make your changes and submit a pull request.

diff --git a/activerecord-mysql2rgeo-adapter.gemspec b/activerecord-mysql2rgeo-adapter.gemspec
@@ -21,7 +21,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.0"
   spec.add_dependency "rgeo-activerecord", "~> 7.0.0"
   spec.add_dependency "rgeo", "~> 2.0"
 

diff --git a/gemfiles/ar70.gemfile → gemfiles/ar71.gemfile b/gemfiles/ar70.gemfile → gemfiles/ar71.gemfile
@@ -6,6 +6,6 @@ gem "mysql2", "~> 0.5.2", platform: :ruby
 gem "jdbc-mysql", platform: :jruby
 gem "activerecord-jdbc-adapter", "~> 5.0", platform: :jruby
 gem "ffi-geos", platform: :jruby
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/lib/active_record/connection_adapters/mysql2rgeo/schema_statements.rb b/lib/active_record/connection_adapters/mysql2rgeo/schema_statements.rb
@@ -39,7 +39,7 @@ def create_table_definition(*args, **options)
         end
 
         # override
-        def new_column_from_field(table_name, field)
+        def new_column_from_field(table_name, field, _definitions)
           type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
           default, default_function = field[:Default], nil
 

diff --git a/lib/active_record/connection_adapters/mysql2rgeo/version.rb b/lib/active_record/connection_adapters/mysql2rgeo/version.rb
@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "7.0.1"
+      VERSION = "7.1.0"
     end
   end
 end