add in AR 6.1 and 7.0 support, also Ruby 3.1

Author: urkle

.github/workflows/prs.yml

@@ -22,9 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
+        - '6.1'
+        - '7.0'
         db:
         - mysql2
         - sqlite3
@@ -34,6 +37,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -45,6 +52,10 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -53,10 +64,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

README.md

@@ -107,9 +107,17 @@ schema_plus_indexes is tested on
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.5** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.5** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 

gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

gemfiles/activerecord-6.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

lib/schema_plus/indexes/active_record/migration/command_recorder.rb

@@ -8,7 +8,8 @@ module CommandRecorder
         # inversion of add_index will be remove_index.  add if_exists
         # option for cases where the index doesn't actually exist
         def invert_add_index(args)
-          super.tap { |(command, (arg, options))|
+          super.tap { |(_, args)|
+            options = args[-1]
             options[:if_exists] = true
           }
         end

lib/schema_plus/indexes/middleware/migration.rb

@@ -14,12 +14,23 @@ def before(env)
           end
         end
 
-        # Support :index option in Migration.add_column
-        def after(env)
-          return unless env.options[:index]
-          case env.operation
-          when :add, :record
-            env.caller.add_index(env.table_name, env.column_name, env.options[:index])
+        if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+          # Support :index option in Migration.add_column
+          def after(env)
+            return unless env.options[:index]
+            case env.operation
+            when :add, :record
+              env.caller.add_index(env.table_name, env.column_name, env.options[:index])
+            end
+          end
+        else
+          # Support :index option in Migration.add_column
+          def after(env)
+            return unless env.options[:index]
+            case env.operation
+            when :add, :record
+              env.caller.add_index(env.table_name, env.column_name, **env.options[:index])
+            end
           end
         end
       end

lib/schema_plus/indexes/remove_if_exists.rb

@@ -2,14 +2,24 @@
 
 module SchemaPlus::Indexes
   module RemoveIfExists
-    # Extends rails' remove_index to include this options:
-    #   :if_exists
-    def remove_index(table_name, *args)
-      options = args.extract_options!
-      if_exists = options.delete(:if_exists)
-      args << options if options.any?
-      return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args))
-      super table_name, *args
+    if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+      # Extends rails' remove_index to include this options:
+      #   :if_exists
+      def remove_index(table_name, *args)
+        options = args.extract_options!
+        if_exists = options.delete(:if_exists)
+        args << options if options.any?
+        return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args))
+        super table_name, *args
+      end
+    else
+      # Extends rails' remove_index to include this options:
+      #   :if_exists
+      def remove_index(table_name, column_name = nil, other = nil, **options)
+        if_exists = options.delete(:if_exists)
+        return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, column_name || options))
+        super table_name, column_name, **options
+      end
     end
   end
 end

schema_dev.yml

@@ -2,9 +2,12 @@ ruby:
     - 2.5
     - 2.7
     - 3.0
+    - 3.1
 activerecord:
     - 5.2
     - 6.0
+    - 6.1
+    - 7.0
 db:
     - mysql2
     - sqlite3

schema_plus_indexes.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
-  gem.add_dependency "schema_plus_core", "~> 3.0"
+  gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
+  gem.add_dependency "schema_plus_core", "~> 3.1.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 4.1"
+  gem.add_development_dependency "schema_dev", "~> 4.2.0"
 end