add in AR 6.1 and 7.0 support, also Ruby 3.1

.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:
@@ -69,6 +76,22 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '12'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -101,6 +124,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
         - ruby: '3.0'
           activerecord: '6.0'
           db: postgresql
@@ -117,6 +172,86 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '12'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '10'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '11'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '12'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

README.md

@@ -29,9 +29,17 @@ SchemaPlus::Views 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**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 * ruby **2.5** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **sqlite3**, **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
 
 <!-- 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

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_views.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5'
 
-  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.beta.1'
 
   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.beta.1'
 end

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))