schema_plus_core 2.2.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c91ca6a28894c17bf6b73d7b8c57f03500dd6474194e5df25afe8727a3691c
-  data.tar.gz: 32d4f2437d5d3ff1f31f050fb407f26dc80bdaabeb81f8779dfbfd72182de49e
+  metadata.gz: f7652a3a8995b2ceb95a9c67ed8e03dc2f5281414b2495c5dbb715b7ca5946fb
+  data.tar.gz: 225bc856147f2e0cb1bdf32571d4e36d3cd4fd181a1dd2e7b385d8203383fef4
 SHA512:
-  metadata.gz: 2778bbf477a925da8a58dbb577e0a2ac292a919fd3db813f2d404cce2957438f329f7ed2d567fe1f24ebcde15ea5225cafea854b831db4bb23168983b0d165bd
-  data.tar.gz: 8571518821c17bf21cbf6ff77c4dec9c4ac29d501323446fd2df30d9453e8918597ca41d2c5aec09aea580feae7ad9ff9a57b7c08c8cc270ec7df73c0d64913f
+  metadata.gz: 369dca1de7a89d21963f3de3ba8b045b7c09c4f80188e63981c2c0b9cc0ed1d82618d372e42070390e75ca778a3b7d107a3d3991d6907ce05a6b0d00022f5508
+  data.tar.gz: a1be30796efe7e9d767168a686b723f482f525df6ab19108eba7a64df1c07207a4dddde7ba2991d3e583174fd488f06b605d2a95c35cbbad6a442e16de7d5bd6

data/.github/workflows/prs.yml

@@ -0,0 +1,134 @@
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+name: CI PR Builds
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.5'
+        - '2.7'
+        - '3.0'
+        activerecord:
+        - '5.2'
+        - '6.0'
+        db:
+        - mysql2
+        - sqlite3
+        - skip
+        dbversion:
+        - skip
+        exclude:
+        - ruby: '3.0'
+          activerecord: '5.2'
+        - db: skip
+          dbversion: skip
+        include:
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.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
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_DB_PASS: database
+      MYSQL_DB_HOST: 127.0.0.1
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - name: Run bundle update
+      run: bundle update
+    - name: Start Postgresql
+      if: matrix.db == 'postgresql'
+      run: |
+        docker run --rm --detach \
+          -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+          -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+          -p 5432:5432 \
+          --health-cmd "pg_isready -q" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database postgres:${{ matrix.dbversion }}
+    - name: Start Mysql
+      if: matrix.db == 'mysql2'
+      run: |
+        docker run --rm --detach \
+          -e MYSQL_ROOT_PASSWORD=$MYSQL_DB_PASS \
+          -p 3306:3306 \
+          --health-cmd "mysqladmin ping --host=127.0.0.1 --password=$MYSQL_DB_PASS --silent" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database mysql:5.6
+    - name: Wait for database to start
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: |
+        COUNT=0
+        ATTEMPTS=20
+        until [[ $COUNT -eq $ATTEMPTS ]]; do
+          [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+          echo $(( COUNT++ )) > /dev/null
+          sleep 2
+        done
+    - name: Create testing database
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: bundle exec rake create_ci_database
+    - name: Run tests
+      run: bundle exec rake spec
+    - name: Shutdown database
+      if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+      run: docker stop database
+    - name: Coveralls Parallel
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+        parallel: true
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        parallel-finished: true

data/.gitignore

@@ -2,6 +2,7 @@
 /tmp
 /pkg
 /Gemfile.local
+/.idea
 
 .byebug_history
 *.lock

data/.simplecov

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+SimpleCov.configure do
+  enable_coverage :branch
+  add_filter '/spec/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_core.svg)](http://badge.fury.io/rb/schema_plus_core)
-[![Build Status](https://travis-ci.org/SchemaPlus/schema_plus_core.svg?branch=master)](http://travis-ci.org/SchemaPlus/schema_plus_core)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_core/actions/workflows/prs.yml/badge.svg)](https://github.com/SchemaPlus/schema_plus_core/actions)
 [![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_core.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_core)
 
 # SchemaPlus::Core
@@ -23,12 +23,11 @@ SchemaPlus::Core is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.4.4** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.4.4** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.4.4** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.5.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.5.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.5.1** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
+* 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.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 **3.0** with activerecord **6.0**, using **postgresql:9.6**, **mysql2** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -444,6 +443,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
 ## Release Notes
 
+* 3.0.0 Drop AR < 5.2 and add AR 6.0 support. Drop Ruby < 2.5 and add Ruby 3.0 support.
 * 2.2.3 Fix dumping complex expression based indexes in AR 5.x
 * 2.2.2 Fixed dumping tables in postgresql in AR 5.2 when the PK is not a bigint.
 * 2.2.1 Fixed expression index handling in AR5.x.
@@ -478,7 +478,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaPlus::Core uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
   facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
-  [travis-ci](http://travis-ci.org/SchemaPlus/schema_plus_core)
+  [github actions](https://github.com/SchemaPlus/schema_plus_core/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -490,7 +490,6 @@ Some things to know about to help you develop and test:
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_MONKEY - begin -->

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec :path => File.expand_path('..', __FILE__)
+gemspec path: File.expand_path('..', __FILE__)
 
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -1,3 +1,4 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
 
 gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "mysql2"

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "pg"

data/gemfiles/activerecord-5.2/Gemfile.sqlite3

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "sqlite3"
@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+end

data/gemfiles/activerecord-6.0/Gemfile.base

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

data/gemfiles/activerecord-6.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-6.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-5.0 → activerecord-6.0}/Gemfile.sqlite3

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "sqlite3"
@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
@@ -22,25 +24,25 @@ module SchemaPlus
           # relies on the undocumented return value.
           def has_many(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
-              env.result = super(env.name, env.scope, env.options, &env.extension)
+              env.result = super(env.name, env.scope, **env.options, &env.extension)
             end.result
           end
 
           def has_one(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
-              env.result = super(env.name, env.scope, env.options, &env.extension)
+              env.result = super(env.name, env.scope, **env.options, &env.extension)
             end.result
           end
 
           def has_and_belongs_to_many(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
-              env.result = super(env.name, env.scope, env.options, &env.extension)
+              env.result = super(env.name, env.scope, **env.options, &env.extension)
             end.result
           end
 
           def belongs_to(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
-              env.result = super(env.name, env.scope, env.options, &env.extension)
+              env.result = super(env.name, env.scope, **env.options, &env.extension)
             end.result
           end
         end

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

@@ -1,37 +1,39 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
       module ConnectionAdapters
         module AbstractAdapter
 
-          def add_column(table_name, name, type, options = {})
+          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|
-              super env.table_name, env.column_name, env.type, env.options
+              super env.table_name, env.column_name, env.type, **env.options
             end
           end
 
-          def add_index_options(table_name, column_names, options={})
+          def add_index_options(table_name, column_names, **options)
             SchemaMonkey::Middleware::Sql::IndexComponents.start(connection: self, table_name: table_name, column_names: Array.wrap(column_names), options: options.deep_dup, sql: SqlStruct::IndexComponents.new) { |env|
-              env.sql.name, env.sql.type, env.sql.columns, env.sql.options, env.sql.algorithm, env.sql.using = super env.table_name, env.column_names, env.options
-            }.sql.to_hash.values
+              env.sql.name, env.sql.type, env.sql.columns, env.sql.options, env.sql.algorithm, env.sql.using = super env.table_name, env.column_names, **env.options
+            }.sql.to_h.values
           end
 
-          def add_reference(table_name, name, options = {})
+          def add_reference(table_name, name, **options)
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :add, table_name: table_name, column_name: "#{name}_id", type: :reference, options: options.deep_dup) do |env|
-              super env.table_name, env.column_name.sub(/_id$/, ''), env.options.merge(_implements_reference: true)
+              super env.table_name, env.column_name.sub(/_id$/, ''), **env.options.merge(_implements_reference: true)
             end
           end
 
-          def create_table(table_name, options={}, &block)
+          def create_table(table_name, **options, &block)
             SchemaMonkey::Middleware::Migration::CreateTable.start(connection: self, table_name: table_name, options: options.deep_dup, block: block) do |env|
-              super env.table_name, env.options, &env.block
+              super env.table_name, **env.options, &env.block
             end
           end
 
-          def drop_table(table_name, options={})
+          def drop_table(table_name, **options)
             SchemaMonkey::Middleware::Migration::DropTable.start(connection: self, table_name: table_name, options: options.dup) do |env|
-              super env.table_name, env.options
+              super env.table_name, **env.options
             end
           end
 
@@ -44,7 +46,7 @@ module SchemaPlus
                 output_columns << column
               else
                 quoted = {column.to_sym => quote_column_name(column).dup}
-                output_columns.concat add_options_for_index_columns(quoted, options).values
+                output_columns.concat add_options_for_index_columns(quoted, **options).values
               end
             end
 
@@ -56,7 +58,7 @@ module SchemaPlus
           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|
+              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

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

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
       module ConnectionAdapters
         module Mysql2Adapter
 
-          def change_column(table_name, name, type, options = {})
+          def change_column(table_name, name, type, **options)
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :change, table_name: table_name, column_name: name, type: type, options: options.deep_dup) do |env|
-              super env.table_name, env.column_name, env.type, env.options
+              super env.table_name, env.column_name, env.type, **env.options
             end
           end
 
-          def add_index(table_name, column_names, options={})
+          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
+              super env.table_name, env.column_names, **env.options
             end
           end
 
-          def drop_table(table_name, options={})
+          def drop_table(table_name, **options)
             SchemaMonkey::Middleware::Migration::DropTable.start(connection: self, table_name: table_name, options: options.dup) do |env|
-              super env.table_name, env.options
+              super env.table_name, **env.options
             end
           end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord

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

@@ -1,42 +1,26 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
       module ConnectionAdapters
         module PostgresqlAdapter
-
-          # quick hack fix quoting of column default functions to allow eval() when we
-          # capture the stream.
-          #
-          # AR's PostgresqlAdapter#prepare_column_options wraps the
-          # function in double quotes, which doesn't work because the
-          # function itself may have doublequotes in it which don't get
-          # escaped properly.
-          #
-          # Arguably that's a bug in AR, but then again default function
-          # expressions don't work well in AR anyway.  (hence
-          # schema_plus_default_expr )
-          #
-          def prepare_column_options(column, *) # :nodoc:
-            spec = super
-            spec[:default] = "%q{#{column.default_function}}" if column.default_function
-            spec
-          end
-
-          def change_column(table_name, name, type, options = {})
+          
+          def change_column(table_name, name, type, **options)
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :change, table_name: table_name, column_name: name, type: type, options: options.deep_dup) do |env|
-              super env.table_name, env.column_name, env.type, env.options
+              super env.table_name, env.column_name, env.type, **env.options
             end
           end
 
-          def add_index(table_name, column_names, options={})
+          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
+              super env.table_name, env.column_names, **env.options
             end
           end
 
-          def drop_table(table_name, options={})
+          def drop_table(table_name, **options)
             SchemaMonkey::Middleware::Migration::DropTable.start(connection: self, table_name: table_name, options: options.dup) do |env|
-              super env.table_name, env.options
+              super env.table_name, **env.options
             end
           end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
@@ -10,15 +12,15 @@ module SchemaPlus
             end
           end
 
-          def change_column(table_name, name, type, options = {})
+          def change_column(table_name, name, type, **options)
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :change, table_name: table_name, column_name: name, type: type, options: options.deep_dup) do |env|
-              super env.table_name, env.column_name, env.type, env.options
+              super env.table_name, env.column_name, env.type, **env.options
             end
           end
 
-          def add_index(table_name, column_names, options={})
+          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
+              super env.table_name, env.column_names, **env.options
             end
           end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
@@ -7,27 +9,25 @@ module SchemaPlus
           def column(name, type, options = {})
             options = options.deep_dup
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :define, table_name: self.name, column_name: name, type: type, implements_reference: options.delete(:_implements_reference), options: options) do |env|
-              super env.column_name, env.type, env.options
+              super env.column_name, env.type, **env.options
             end
           end
 
-          def references(name, options = {})
+          def references(name, **options)
             options = options.deep_dup
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :define, table_name: self.name, column_name: "#{name}_id", type: :reference, options: options) do |env|
-              super env.column_name.sub(/_id$/, ''), env.options.merge(_implements_reference: true)
+              super env.column_name.sub(/_id$/, ''), **env.options.merge(_implements_reference: true)
             end
           end
 
-          def belongs_to(name, options = {})
+          def belongs_to(name, **options)
             options = options.deep_dup
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :define, table_name: self.name, column_name: "#{name}_id", type: :reference, options: options) do |env|
-              super env.column_name.sub(/_id$/, ''), env.options.merge(_implements_reference: true)
+              super env.column_name.sub(/_id$/, ''), **env.options.merge(_implements_reference: true)
             end
           end
 
-          def index(*args)
-            options = args.extract_options!
-            column_name = args.first
+          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

data/lib/schema_plus/core/active_record/migration/command_recorder.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
       module Migration
         module CommandRecorder
 
-          def add_column(table_name, column_name, type, options = {})
+          def add_column(table_name, column_name, type, **options)
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :record, table_name: table_name, column_name: column_name, type: type, options: options.deep_dup) do |env|
-              super env.table_name, env.column_name, env.type, env.options
+              super env.table_name, env.column_name, env.type, **env.options
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Core
   module ActiveRecord
     module Schema

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'tsort'
 

data/lib/schema_plus/core/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module Middleware

data/lib/schema_plus/core/schema_dump.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     class SchemaDump
@@ -43,7 +45,8 @@ module SchemaPlus
         @dependencies[tablename].sort.uniq.reject{|t| @dumper.ignored? t}.each(&block)
       end
 
-      class Table < KeyStruct[:name, :pname, :options, :columns, :indexes, :statements, :trailer, :alt]
+      class Table < Struct.new(:name, :pname, :options, :columns, :indexes, :statements, :trailer, :alt,
+                               keyword_init: true)
         def initialize(*args)
           super
           self.columns ||= []
@@ -85,7 +88,7 @@ module SchemaPlus
           stream.puts ""
         end
 
-        class Column < KeyStruct[:name, :type, :options, :comments]
+        class Column < Struct.new(:name, :type, :options, :comments, keyword_init: true)
 
           def assemble(stream, typelen, namelen)
             stream.write "t.%-#{typelen}s " % type
@@ -102,7 +105,7 @@ module SchemaPlus
           end
         end
 
-        class Index < KeyStruct[:name, :columns, :options]
+        class Index < Struct.new(:name, :columns, :options, keyword_init: true)
 
           def assemble(stream)
             stream.write columns.inspect + ", " + {name: name}.merge(options).to_s.sub(/^{(.*)}$/, '\1')

data/lib/schema_plus/core/sql_struct.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module SqlStruct
-      IndexComponents = KeyStruct[:name, :type, :columns, :options, :algorithm, :using]
+      IndexComponents = Struct.new(:name, :type, :columns, :options, :algorithm, :using, keyword_init: true)
 
-      class Table < KeyStruct[:command, :name, :body, :options, :quotechar, :inheritance]
+      class Table < Struct.new(:command, :name, :body, :options, :quotechar, :inheritance, keyword_init: true)
 
         INHERITANCE_REGEX = %r{ \s* (?<inheritance>INHERITS \s* \( [^)]* \)) }mxi
 

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
-    VERSION = "2.2.3"
+    VERSION = "3.0.0"
   end
 end

data/lib/schema_plus/core.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require "schema_monkey"
-require 'its-it'
 require "pathname"
 
 module SchemaPlus
@@ -26,8 +27,6 @@ require_relative "core/schema_dump"
 require_relative "core/sql_struct"
 require_relative "core/version"
 
-if ActiveRecord.version >= Gem::Version.new('5.2')
-  require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
-end
+require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
 
 SchemaMonkey.register(SchemaPlus::Core)

data/schema_dev.yml

@@ -1,11 +1,11 @@
 ruby:
-    - 2.4.4
-    - 2.5.1
+    - 2.5
+    - 2.7
+    - 3.0
 activerecord:
-    - 5.0
-    - 5.1
     - 5.2
+    - 6.0
 db:
+    - postgresql
     - mysql2
     - sqlite3
-    - postgresql

data/schema_plus_core.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'schema_plus/core/version'
@@ -18,16 +19,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 5.0"
-  gem.add_dependency "schema_monkey", "~> 2.1"
-  gem.add_dependency "its-it", "~> 1.2"
+  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_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.0"
+  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", "~> 3.11"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
-  gem.add_development_dependency "its-it"
+  gem.add_development_dependency "schema_dev", "~> 4.1"
 end

data/spec/column_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestImplementsReference
@@ -27,8 +29,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
     let (:spy) { described_class.const_get(:SPY) }
 
     let (:pk_type) do
-      if ActiveRecord.version >= Gem::Version.new('5.1') &&
-         ActiveRecord::Base.connection.adapter_name =~ /mysql|postgresql/i
+      if ActiveRecord::Base.connection.adapter_name =~ /mysql|postgresql/i
         :bigint
       else
         :integer

data/spec/dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestDumper
@@ -83,7 +85,7 @@ describe SchemaMonkey::Middleware::Dumper do
   context TestDumper::Middleware::Dumper::Tables do
     Then { expect(dump).to match(/create_table "other".*create_table "#{middleware}".*create_table "things"/m) }
 
-    context 'int PK handling in rails 5.2+', postgresql: :only, rails: ['>= 5.2.0'] do
+    context 'int PK handling in rails 5.2+', postgresql: :only do
       before(:each) do
         migration.create_table "inttable", id: :serial do |t|
         end

data/spec/index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaMonkey::Middleware::Migration::Index do

data/spec/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaMonkey::Middleware do
@@ -17,7 +19,7 @@ describe SchemaMonkey::Middleware do
 
     context TestReporter::Middleware::Query::Exec do
       Then { expect_middleware(enable: {sql: /SELECT column1/}) { connection.select_values("SELECT column1 FROM things") } }
-      Then { expect_middleware(enable: {sql: /^UPDATE/}) { thing.update_attributes!(column1: 3) } }
+      Then { expect_middleware(enable: {sql: /^UPDATE/}) { thing.update!(column1: 3) } }
       Then { expect_middleware(enable: {sql: /^DELETE/}) { thing.delete } }
     end
   end
@@ -30,7 +32,7 @@ describe SchemaMonkey::Middleware do
     end
 
     context TestReporter::Middleware::Schema::DataSources do
-      Then { expect_middleware { connection.data_sources() } }
+      Then { expect_middleware { connection.data_sources } }
     end
 
     context TestReporter::Middleware::Schema::Indexes do
@@ -119,6 +121,7 @@ describe SchemaMonkey::Middleware do
       end
 
       Then do
+
         class TestThingamajig < ActiveRecord::Base
           has_and_belongs_to_many :other_things, join_table: 'another_table'
         end

data/spec/spec_helper.rb

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

data/spec/sql_struct_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SchemaPlus::Core::SqlStruct do

data/spec/support/enableable.rb

@@ -1,9 +1,9 @@
-require "its-it"
+# frozen_string_literal: true
 
 module Enableable
 
   def enabled_middleware(root, env)
-    middleware = self.singleton_class.ancestors.find(&it.to_s.start_with?("#{root}::Middleware"))
+    middleware = self.singleton_class.ancestors.find { |it| it.to_s.start_with?("#{root}::Middleware") }
     return nil unless middleware.enabled?(env)
     middleware.disable if middleware.once?(env)
     middleware
@@ -32,5 +32,3 @@ module Enableable
     end
   end
 end
-
-

data/spec/support/test_reporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TestReporter
 
   class Called < Exception
@@ -15,7 +17,7 @@ module TestReporter
 
     def after(env)
       return unless middleware = enabled_middleware(TestReporter, env)
-      raise Called, middleware: middleware, env: env
+      raise Called.new middleware: middleware, env: env
     end
   end
 

metadata

@@ -1,85 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: schema_monkey
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: its-it
+  name: schema_monkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,56 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-gem-profile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: its-it
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: Provides an internal extension API to ActiveRecord, in the form of middleware-style
   callback stacks
 email:
@@ -172,25 +122,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prs.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".simplecov"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-5.0/Gemfile.base
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.sqlite3
-- gemfiles/activerecord-5.1/Gemfile.base
-- gemfiles/activerecord-5.1/Gemfile.mysql2
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.sqlite3
 - gemfiles/activerecord-5.2/Gemfile.base
 - gemfiles/activerecord-5.2/Gemfile.mysql2
 - gemfiles/activerecord-5.2/Gemfile.postgresql
 - gemfiles/activerecord-5.2/Gemfile.sqlite3
+- gemfiles/activerecord-6.0/Gemfile.base
+- gemfiles/activerecord-6.0/Gemfile.mysql2
+- gemfiles/activerecord-6.0/Gemfile.postgresql
+- gemfiles/activerecord-6.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
@@ -220,7 +167,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,16 +175,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Provides an internal extension API to ActiveRecord
 test_files:

data/.travis.yml

@@ -1,25 +0,0 @@
-# This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml
-# Please do not edit this file; any changes will be overwritten next time
-# schema_dev gets run.
----
-sudo: false
-rvm:
-- 2.4.4
-- 2.5.1
-gemfile:
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.sqlite3
-- gemfiles/activerecord-5.1/Gemfile.mysql2
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.sqlite3
-- gemfiles/activerecord-5.2/Gemfile.mysql2
-- gemfiles/activerecord-5.2/Gemfile.postgresql
-- gemfiles/activerecord-5.2/Gemfile.sqlite3
-env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
-addons:
-  postgresql: '9.4'
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "activerecord", "~> 5.0.1"

data/gemfiles/activerecord-5.0/Gemfile.mysql2

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "mysql2"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcmysql-adapter'
-end

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "pg", "< 1"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end

data/gemfiles/activerecord-5.1/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "activerecord", "~> 5.1.0"

data/gemfiles/activerecord-5.1/Gemfile.mysql2

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "mysql2"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcmysql-adapter'
-end

data/gemfiles/activerecord-5.1/Gemfile.postgresql

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "pg", "< 1"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end

data/gemfiles/activerecord-5.1/Gemfile.sqlite3

@@ -1,10 +0,0 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
-
-platform :ruby do
-  gem "sqlite3"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end