schema_plus_core 3.0.0 → 3.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7652a3a8995b2ceb95a9c67ed8e03dc2f5281414b2495c5dbb715b7ca5946fb
-  data.tar.gz: 225bc856147f2e0cb1bdf32571d4e36d3cd4fd181a1dd2e7b385d8203383fef4
+  metadata.gz: 4586a053807f1a6935ef1198491c6ab3c9ea3a1a11869f18b042ca4b380d20b3
+  data.tar.gz: 89c538ce9a32abf2150e5cea263fbbfe8c526e5b225494be653e09a03bbe3525
 SHA512:
-  metadata.gz: 369dca1de7a89d21963f3de3ba8b045b7c09c4f80188e63981c2c0b9cc0ed1d82618d372e42070390e75ca778a3b7d107a3d3991d6907ce05a6b0d00022f5508
-  data.tar.gz: a1be30796efe7e9d767168a686b723f482f525df6ab19108eba7a64df1c07207a4dddde7ba2991d3e583174fd488f06b605d2a95c35cbbad6a442e16de7d5bd6
+  metadata.gz: cf582e7744f5d17225ae48033a912cc0b2f27e3c9bea09cf5fe02334dc794b821281bc5c5ae89391a6385c4aca407f1a31d0a54076396b337ac8e3e5c68fd2c2
+  data.tar.gz: 2d9cd2b0b7ee4f326cf98366b3f20fb1acf7fd37f40614ac6e66e9c7379493afbcf68757f511e90663b4ccb64cb0acefb6225ec61ad8408407b8c1448bb88aac

data/.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 }}"
       POSTGRESQL_DB_HOST: 127.0.0.1

data/Gemfile

@@ -4,4 +4,5 @@ source "http://rubygems.org"
 
 gemspec
 
-File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local

data/README.md

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

data/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"

data/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

data/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

data/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

data/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"

data/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

data/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

data/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

data/lib/schema_plus/core/active_record/connection_adapters/abstract_adapter.rb

@@ -5,7 +5,6 @@ module SchemaPlus
     module ActiveRecord
       module ConnectionAdapters
         module AbstractAdapter
-
           def add_column(table_name, name, type, **options)
             options = options.deep_dup
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :add, table_name: table_name, column_name: name, type: type, implements_reference: options.delete(:_implements_reference), options: options) do |env|
@@ -36,27 +35,65 @@ module SchemaPlus
               super env.table_name, **env.options
             end
           end
+        end
+      end
 
-          # replaced version to handle array of columns with expressions
-          def quoted_columns_for_index(column_names, **options)
-            output_columns = []
+      if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+        module ConnectionAdapters
+          module AbstractAdapter
+            # replaced version to handle array of columns with expressions
+            def quoted_columns_for_index(column_names, **options)
+              output_columns = []
 
-            column_names.each do |column|
-              if column.is_a?(String) && column.include?('(')
-                output_columns << column
-              else
-                quoted = {column.to_sym => quote_column_name(column).dup}
-                output_columns.concat add_options_for_index_columns(quoted, **options).values
+              column_names.each do |column|
+                if column.is_a?(String) && column.include?('(')
+                  output_columns << column
+                else
+                  quoted = {column.to_sym => quote_column_name(column).dup}
+                  output_columns.concat add_options_for_index_columns(quoted, **options).values
+                end
               end
+
+              output_columns
             end
 
-            output_columns
-          end
-          private :quoted_columns_for_index
+            private :quoted_columns_for_index
 
+            module SchemaCreation
 
-          module SchemaCreation
+              def add_column_options!(sql, options)
+                sql << +" " + SchemaMonkey::Middleware::Sql::ColumnOptions.start(caller: self, connection: self.instance_variable_get('@conn'), sql: +"", column: options[:column], options: options.except(:column)) { |env|
+                  super env.sql, env.options.merge(column: env.column)
+                }.sql.lstrip
+              end
 
+              def visit_TableDefinition(o)
+                SchemaMonkey::Middleware::Sql::Table.start(caller: self, connection: self.instance_variable_get('@conn'), table_definition: o, sql: SqlStruct::Table.new) { |env|
+                  env.sql.parse! super env.table_definition
+                }.sql.assemble
+              end
+            end
+          end
+        end
+      else
+        # In AR 6.1+ quoted_columns_for_index has slightly different paramater style and a different return type
+        # Also SchemaCreation is no longer nested beneath AbstractAdapter
+        module ConnectionAdapters
+          module AbstractAdapter
+            # replaced version to handle array of columns with expressions
+            def quoted_columns_for_index(column_names, options)
+              column_names.each_with_object([]) do |column, output_columns|
+                if column.is_a?(String) && column.include?('(')
+                  output_columns << column
+                else
+                  quoted = {column.to_sym => quote_column_name(column).dup}
+                  output_columns.concat add_options_for_index_columns(quoted, **options).values
+                end
+              end.join(', ')
+            end
+          end
+
+          module SchemaCreation
             def add_column_options!(sql, options)
               sql << +" " + SchemaMonkey::Middleware::Sql::ColumnOptions.start(caller: self, connection: self.instance_variable_get('@conn'), sql: +"", column: options[:column], options: options.except(:column)) { |env|
                 super env.sql, env.options.merge(column: env.column)

data/lib/schema_plus/core/active_record/connection_adapters/mysql2_adapter.rb

@@ -12,9 +12,17 @@ module SchemaPlus
             end
           end
 
-          def add_index(table_name, column_names, options = {})
-            SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
-              super env.table_name, env.column_names, **env.options
+          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+            def add_index(table_name, column_names, options = {})
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, env.options
+              end
+            end
+          else
+            def add_index(table_name, column_names, **options)
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, **env.options
+              end
             end
           end
 

data/lib/schema_plus/core/active_record/connection_adapters/postgresql/schema_dumper.rb

@@ -26,11 +26,15 @@ module SchemaPlus
               end
 
               def extensions(_)
-                SchemaMonkey::Middleware::Dumper::Initial.start(dumper: self, connection: @connection, dump: @dump, initial: @dump.initial) do |env|
-                  stream = StringIO.new
-                  super stream
-                  env.dump.initial << stream.string unless stream.string.blank?
-                end
+                stream = StringIO.new
+                super stream
+                @dump.extensions << stream.string unless stream.string.blank?
+              end
+
+              def types(_)
+                stream = StringIO.new
+                super stream
+                @dump.types << stream.string unless stream.string.blank?
               end
             end
           end

data/lib/schema_plus/core/active_record/connection_adapters/postgresql_adapter.rb

@@ -12,9 +12,17 @@ module SchemaPlus
             end
           end
 
-          def add_index(table_name, column_names, options = {})
-            SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
-              super env.table_name, env.column_names, **env.options
+          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+            def add_index(table_name, column_names, options = {})
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, env.options
+              end
+            end
+          else
+            def add_index(table_name, column_names, **options)
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, **env.options
+              end
             end
           end
 
@@ -30,15 +38,15 @@ module SchemaPlus
             end
           end
 
-          def exec_cache(sql, name, binds)
-            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds) { |env|
-              env.result = super env.sql, env.query_name, env.binds
+          def exec_cache(sql, name, binds, **options)
+            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds, options: options) { |env|
+              env.result = super env.sql, env.query_name, env.binds, **env.options
             }.result
           end
 
-          def exec_no_cache(sql, name, binds)
-            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds) { |env|
-              env.result = super env.sql, env.query_name, env.binds
+          def exec_no_cache(sql, name, binds, **options)
+            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds, options: options) { |env|
+              env.result = super env.sql, env.query_name, env.binds, **env.options
             }.result
           end
 

data/lib/schema_plus/core/active_record/connection_adapters/sqlite3_adapter.rb

@@ -18,9 +18,17 @@ module SchemaPlus
             end
           end
 
-          def add_index(table_name, column_names, options = {})
-            SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
-              super env.table_name, env.column_names, **env.options
+          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+            def add_index(table_name, column_names, options = {})
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, env.options
+              end
+            end
+          else
+            def add_index(table_name, column_names, **options)
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :add, table_name: table_name, column_names: column_names, options: options.deep_dup) do |env|
+                super env.table_name, env.column_names, **env.options
+              end
             end
           end
 

data/lib/schema_plus/core/active_record/connection_adapters/table_definition.rb

@@ -27,9 +27,17 @@ module SchemaPlus
             end
           end
 
-          def index(column_name, options = {})
-            SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :define, table_name: self.name, column_names: column_name, options: options.deep_dup) do |env|
-              super env.column_names, env.options
+          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+            def index(column_name, options = {})
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :define, table_name: self.name, column_names: column_name, options: options.deep_dup) do |env|
+                super env.column_names, env.options
+              end
+            end
+          else
+            def index(column_name, **options)
+              SchemaMonkey::Middleware::Migration::Index.start(caller: self, operation: :define, table_name: self.name, column_names: column_name, options: options.deep_dup) do |env|
+                super env.column_names, **env.options
+              end
             end
           end
         end

data/lib/schema_plus/core/active_record/schema_dumper.rb

@@ -32,14 +32,26 @@ module SchemaPlus
           @dump.trailer = stream.string
         end
 
-        def extensions(_)
+        def header(_)
           SchemaMonkey::Middleware::Dumper::Initial.start(dumper: self, connection: @connection, dump: @dump, initial: @dump.initial) do |env|
             stream = StringIO.new
             super stream
-            env.dump.initial << stream.string unless stream.string.blank?
+            env.dump.header = stream.string
           end
         end
 
+        def extensions(_)
+          stream = StringIO.new
+          super stream
+          @dump.extensions << stream.string unless stream.string.blank?
+        end
+
+        def types(_)
+          stream = StringIO.new
+          super stream
+          @dump.types << stream.string unless stream.string.blank?
+        end
+
         def tables(_)
           SchemaMonkey::Middleware::Dumper::Tables.start(dumper: self, connection: @connection, dump: @dump) do |env|
             super nil

data/lib/schema_plus/core/middleware.rb

@@ -5,7 +5,7 @@ module SchemaPlus
     module Middleware
       module Query
         module Exec
-          ENV = [:connection, :sql, :query_name, :binds, :prepare, :result]
+          ENV = [:connection, :sql, :query_name, :binds, :options, :prepare, :result]
         end
       end
 

data/lib/schema_plus/core/schema_dump.rb

@@ -5,13 +5,16 @@ module SchemaPlus
     class SchemaDump
       include TSort
 
-      attr_reader :initial, :tables, :dependencies, :data
-      attr_accessor :final, :trailer
+      attr_reader :initial, :extensions, :types, :tables, :dependencies, :data
+      attr_accessor :header, :final, :trailer
 
       def initialize(dumper)
         @dumper = dumper
         @dependencies = Hash.new { |h, k| h[k] = [] }
+        @header = ''
         @initial = []
+        @extensions = []
+        @types = []
         @tables = {}
         @final = []
         @data = OpenStruct.new # a place for middleware to leave data
@@ -23,7 +26,10 @@ module SchemaPlus
       end
 
       def assemble(stream)
+        stream.puts @header
         stream.puts @initial.join("\n") if initial.any?
+        stream.puts @extensions.join("\n") if extensions.any?
+        stream.puts @types.join("\n") if types.any?
         assemble_tables(stream)
         final.each do |statement|
           stream.puts "  #{statement}"

data/lib/schema_plus/core/version.rb

@@ -2,6 +2,6 @@
 
 module SchemaPlus
   module Core
-    VERSION = "3.0.0"
+    VERSION = "3.1.0.beta.3"
   end
 end

data/lib/schema_plus/core.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "schema_monkey"
+require 'active_support/core_ext/array/wrap'
 require "pathname"
 
 module SchemaPlus

data/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:
     - postgresql
     - mysql2

data/schema_plus_core.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
-  gem.add_dependency "schema_monkey", "~> 3.0.1"
+  gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
+  gem.add_dependency "schema_monkey", "~> 3.0.2.beta.1"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake", "~> 13.0.0"
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rspec-given"
-  gem.add_development_dependency "schema_dev", "~> 4.1"
+  gem.add_development_dependency "schema_dev", "~> 4.2.beta.1"
 end

data/spec/dumper_spec.rb

@@ -46,16 +46,14 @@ describe SchemaMonkey::Middleware::Dumper do
 
   let(:migration) { ::ActiveRecord::Migration }
 
-  TestCustomType = SchemaDev::Rspec::Helpers.postgresql?
-
-  around(:each) do |example|
+  around(postgresql: :only) do |example|
     begin
-      migration.execute "CREATE TYPE custom_type AS ENUM ('a', 'b')";
+      migration.execute "CREATE TYPE custom_type AS ENUM ('a', 'b')"
       example.run
     ensure
       migration.execute "DROP TYPE IF EXISTS custom_type CASCADE";
     end
-  end if TestCustomType
+  end
 
   before(:each) do
     migration.create_table "things" do |t|
@@ -66,7 +64,10 @@ describe SchemaMonkey::Middleware::Dumper do
       t.references :thing
     end
     migration.add_foreign_key("other", "things")
-    migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)" if TestCustomType
+  end
+
+  before(postgresql: :only) do
+    migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)"
   end
 
   context "column default expressions", postgresql: :only do
@@ -79,7 +80,7 @@ describe SchemaMonkey::Middleware::Dumper do
   end
 
   context TestDumper::Middleware::Dumper::Initial do
-    Then { expect(dump).to match(/Schema[.]define.*do\s+#{middleware}/) }
+    Then { expect(dump).to match(/Schema([\[\].0-9]+)?[.]define.*do\s+#{middleware}/) }
   end
 
   context TestDumper::Middleware::Dumper::Tables do
@@ -112,7 +113,14 @@ describe SchemaMonkey::Middleware::Dumper do
   context TestDumper::Middleware::Dumper::Table do
     Then { expect(dump).to match(/t[.]integer.*:option=>"#{middleware}" \# comment: #{middleware}/) }
     Then { expect(dump).to match(/statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/) }
-    Then { expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi) } if TestCustomType
+
+    Then(postgresql: :only, rails: '< 7.0') {
+      expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi)
+    }
+    Then(postgresql: :only, rails: '>= 7.0') {
+      expect(dump).to match(/create_enum.+custom_type/mi)
+    }
+
     Then { expect(dump).to match(/t[.]index.*:option=>"#{middleware}"/) }
   end
 

data/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'))
@@ -39,4 +39,3 @@ RSpec.configure do |config|
 end
 
 SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0.beta.3
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_monkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2.beta.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.beta.1
 description: Provides an internal extension API to ActiveRecord, in the form of middleware-style
   callback stacks
 email:
@@ -138,6 +138,14 @@ files:
 - gemfiles/activerecord-6.0/Gemfile.mysql2
 - gemfiles/activerecord-6.0/Gemfile.postgresql
 - gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
 - lib/schema_plus/core.rb
 - lib/schema_plus/core/active_record/base.rb
 - lib/schema_plus/core/active_record/connection_adapters/abstract_adapter.rb
@@ -178,11 +186,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Provides an internal extension API to ActiveRecord