schema_plus_foreign_keys 0.1.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237f5ea4424fd65009b719b0f147d91f0bf3ddecd81cfca4ec385b45cfbea3a4
-  data.tar.gz: 82818ed615ce5ded6b395a5f9cef23e77560e316fa00b88579d2791c7b7a9d19
+  metadata.gz: 4320accfc977e0693af01ea8da225767890fe058a20e2fb38a5b3e17d96e5f8a
+  data.tar.gz: 7bb518bae024a887cefc969ec98b0c6b8c79f6818386e04362fe294622c7596c
 SHA512:
-  metadata.gz: 5a46e7c27b80fa7877ec1c788e8566e574b724d53ad676e5ae443c79668a545e569bb0dbf9ec28fcc137e44fc64b67b455a721d0b9d76cdff8cd90e6862bd9fe
-  data.tar.gz: 250f274ce03d0ceea35dccc7e1c9b4cc3775a6802a2a83f64028abd3e38b59cbf17fc502c282c1923389c6ff885c284f33f77c5b99f42d5dbcdb63c79fc08483
+  metadata.gz: 8378363061d53b5f479c12e333489efb6206f47aaf259e50852346f437cd90662dc3efbbb2c2337ef562a29b5f4d92cdd8e5a3f2e7a8c015f70fdc1c5f2e6f3d
+  data.tar.gz: 4a67d8e35b227029cf1af8834d0e387afddded929504a78ccae97a65a0563a8e2bab34f179315a57e8d1990fc1d8544f1cf36cfb2574ec6740a2d92890d74420

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 }}"
+      MYSQL_DB_HOST: 127.0.0.1
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      POSTGRESQL_DB_HOST: 127.0.0.1
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_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 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: 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: 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
 
 *.lock
 *.log

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,5 +1,8 @@
+# frozen_string_literal: true
+
 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

@@ -1,14 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_foreign_keys.svg)](http://badge.fury.io/rb/schema_plus_foreign_keys)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_foreign_keys.svg)](http://travis-ci.org/SchemaPlus/schema_plus_foreign_keys)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_foreign_keys.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_foreign_keys)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_foreign_keys/actions/workflows/prs.yml/badge.svg)](https://github.com/SchemaPlus/schema_plus_foreign_keys/actions)
+[![Coverage Status](https://coveralls.io/repos/github/SchemaPlus/schema_plus_foreign_keys/badge.svg)](https://coveralls.io/github/SchemaPlus/schema_plus_foreign_keys)
 
 # SchemaPlus::ForeignKeys
 
-SchemaPlus::ForeignKeys provides extended support in ActiveRecord.  This includes extended support for declaraing foreign key constraints in migrations; support for deferrable constraints; support for SQLite3; cleaner schema dumps.
+SchemaPlus::ForeignKeys provides extended support in ActiveRecord.  This includes extended support for declaring
+foreign key constraints in migrations; support for deferrable constraints; support for SQLite3; cleaner schema dumps.
 
-SchemaPlus::ForeignKeys is part of the [SchemaPlus](https://github.com/SchemaPlus/) family of Ruby on Rails ActiveRecord extension gems.
+SchemaPlus::ForeignKeys is part of the [SchemaPlus](https://github.com/SchemaPlus/) family of Ruby on Rails ActiveRecord
+extension gems.
 
-For extra convenience, see also [schema_auto_foreign_keys](https://github.com/SchemaPlus/schema_auto_foreign_keys), which creates foriegn key constraints automatically.
+For extra convenience, see also [schema_auto_foreign_keys](https://github.com/SchemaPlus/schema_auto_foreign_keys),
+which creates foriegn key constraints automatically.
 
 
 ## Installation
@@ -29,7 +32,8 @@ gem.add_dependency "schema_plus_foreign_keys" # in a .gemspec
 ### Migrations
 
 To declare a foreign key constraint for a column, use the `:foreign_key`
-option.  The same options can be used with `t.integer`, `t.references`, `t.belongs_to`, `t.foreign_key`, `change_column`, and `add_foreign_key`:
+option.  The same options can be used with `t.integer`, `t.references`, `t.belongs_to`, `t.foreign_key`,
+`change_column`, and `add_foreign_key`:
 
     t.references :author, foreign_key: true           # create a foreign_key to table "authors"
     t.references :author, foreign_key: {}             # create a foreign_key to table "authors"
@@ -70,7 +74,8 @@ them in a `foreign_key` hash, e.g.
     t.references :author, on_delete: :cascade  # shorthand for foreign_key: { on_delete: :cascade }
     t.references :author, references: :people  # shorthand for foreign_key: { references: :people }
 
-To remove a foreign key constraint, you can either change the column, specifying `foreign_key: false`, or use `migration.remove_foreign_key(table, column)`
+To remove a foreign key constraint, you can either change the column, specifying `foreign_key: false`, or
+use `migration.remove_foreign_key(table, column)`
 
 ### Introspection
 
@@ -131,11 +136,14 @@ foreign key options.
 
 ### Schema Dump
 
-For clarity (and because it's required for SQLite3), in the generated `schema_dump.rb` file, the foreign key definitions are inluded within the table definitions.
+For clarity (and because it's required for SQLite3), in the generated `schema_dump.rb` file, the foreign key
+definitions are included within the table definitions.
 
 This means that the tables are output sorted that a table is
-defined before others that depend on it.  If, however, there are circularities in the
-foreign key relations, this won't be possible; In that case some table definitions will include comments indicating a "forward reference" to a table that's farther down in the file, and the constraint will be defined once that table is defined (this can never happen with SQLite3).
+defined before others that depend on it.  If, however, there are circular dependencies in the
+foreign key relations, this won't be possible; In that case some table definitions will include comments indicating
+a "forward reference" to a table that's farther down in the file, and the constraint will be defined once that table
+is defined (this can never happen with SQLite3).
 
 
 ## Compatibility
@@ -144,17 +152,17 @@ SchemaPlus::ForeignKeys is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.3.1** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **4.2.6**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
+* 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.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 **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+* 1.0.0 - Drop Ruby < 2.5 and Rails < 5.2, adding Rails 6.0, and remove many deprecations
 * 0.1.8 - Compatibility with ActiveRecord 5.1 and ActiveRecord 5.2.
 * 0.1.7 - Compatibility with ActiveRecord 5.0.
 * 0.1.6 - Missing require
@@ -178,7 +186,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaPlus::ForeignKeys 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_foreign_keys)
+  [github actions](https://github.com/SchemaPlus/schema_plus_foreign_keys/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -190,7 +198,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_PLUS_CORE - begin -->

data/Rakefile

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'schema_dev/tasks'
 
-task :default => :spec
+task default: :spec
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

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-4.2.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/foreign_keys/active_record/base.rb

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

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract/schema_creation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Core
     module ActiveRecord
@@ -10,20 +12,9 @@ module SchemaPlus
               # conversion of ForeignKeyDefinitions to SQL
               o.to_sql
             end
-
-            # The TableDefinition::foreign_keys attribute contains ForeignKeyDefinitions instead of
-            # [to_table, options] tuples when using schema_plus_foreign_keys.
-            # This function happily accepts to_table and options arguments anyway, so we just ignore
-            # all arguments and treat to_table as the ForeignKeyDefinition and convert it to SQL
-            # directly.
-            def foreign_key_in_create(from_table, to_table, options)
-              accept to_table # This is the ForeignKeyDefinition
-            end
-
           end
         end
       end
     end
   end
 end
-

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'abstract/schema_creation'
 
 module SchemaPlus::ForeignKeys
@@ -22,27 +24,16 @@ module SchemaPlus::ForeignKeys
         # constraints; they must be included in the table specification when
         # it's created.  If you're using Sqlite3, this method will raise an
         # error.)
-        def add_foreign_key(*args) # (table_name, column, to_table, primary_key, options = {})
-          options = args.extract_options!
-          case args.length
-          when 2
-            from_table, to_table = args
-          when 4
-            ActiveSupport::Deprecation.warn "4-argument form of add_foreign_key is deprecated.  use add_foreign_key(from_table, to_table, options)"
-            (from_table, column, to_table, primary_key) = args
-            options.merge!(column: column, primary_key: primary_key)
-          end
-
+        def add_foreign_key(from_table, to_table, **options) # (table_name, column, to_table, primary_key, options = {})
           options = options.dup
           options[:column] ||= foreign_key_column_for(to_table)
-          options[:name]   ||= ForeignKeyDefinition.default_name(from_table, options[:column])
 
           foreign_key_sql = add_foreign_key_sql(from_table, to_table, options)
           execute "ALTER TABLE #{quote_table_name(from_table)} #{foreign_key_sql}"
         end
 
         # called directly by AT's bulk_change_table, for migration
-        # change_table :name, :bulk => true { ... }
+        # change_table :name, bulk: true { ... }
         def add_foreign_key_sql(from_table, to_table, options = {}) #:nodoc:
           foreign_key = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(from_table, AbstractAdapter.proper_table_name(to_table), options)
           "ADD #{foreign_key.to_sql}"
@@ -53,7 +44,7 @@ module SchemaPlus::ForeignKeys
         end
 
         def self.proper_table_name(name)
-          proper_name = ::ActiveRecord::Migration.new.proper_table_name(name)
+          ::ActiveRecord::Migration.new.proper_table_name(name)
         end
 
         # Remove a foreign key constraint
@@ -66,49 +57,18 @@ module SchemaPlus::ForeignKeys
         # (NOTE: Sqlite3 does not support altering a table to remove
         # foreign-key constraints.  If you're using Sqlite3, this method will
         # raise an error.)
-        def remove_foreign_key(*args)
-          from_table, to_table, options = normalize_remove_foreign_key_args(*args)
+        def remove_foreign_key(from_table, to_table = nil, **options)
           options[:column] ||= foreign_key_column_for(to_table)
           if sql = remove_foreign_key_sql(from_table, to_table, options)
             execute "ALTER TABLE #{quote_table_name(from_table)} #{sql}"
           end
         end
 
-        def normalize_remove_foreign_key_args(*args)
-          options = args.extract_options!
-          if options.has_key? :column_names
-            ActiveSupport::Deprecation.warn ":column_names option is deprecated, use :column"
-            options[:column] = options.delete(:column_names)
-          end
-          if options.has_key? :references_column_names
-            ActiveSupport::Deprecation.warn ":references_column_names option is deprecated, use :primary_key"
-            options[:primary_key] = options.delete(:references_column_names)
-          end
-          if options.has_key? :references_table_name
-            ActiveSupport::Deprecation.warn ":references_table_name option is deprecated, use :to_table"
-            options[:to_table] = options.delete(:references_table_name)
-          end
-          case args.length
-          when 1
-            from_table = args[0]
-          when 2
-            from_table, to_table = args
-          when 3, 4
-            ActiveSupport::Deprecation.warn "3- and 4-argument forms of remove_foreign_key are deprecated.  use add_foreign_key(from_table, to_table, options)"
-            (from_table, column, to_table, primary_key) = args
-            options.merge!(column: column, primary_key: primary_key)
-          else
-            raise ArgumentError, "Wrong number of arguments(#{args.length}) to remove_foreign_key"
-          end
-          to_table ||= options.delete(:to_table)
-          [from_table, to_table, options]
-        end
-
         def get_foreign_key_name(from_table, to_table, options)
           return options[:name] if options[:name]
 
           fks = foreign_keys(from_table)
-          if fks.detect(&its.name == to_table)
+          if fks.detect { |it| it.name == to_table }
             ActiveSupport::Deprecation.warn "remove_foreign_key(table, name) is deprecated.  use remove_foreign_key(table, name: name)"
             return to_table
           end

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -1,4 +1,5 @@
-require 'openssl'
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract/schema_definitions'
 
 module SchemaPlus::ForeignKeys
@@ -17,28 +18,7 @@ module SchemaPlus::ForeignKeys
       #   true
       #   :initially_deferred
       module ForeignKeyDefinition
-
-        def column_names
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#column_names is deprecated, use Array.wrap(column)"
-          Array.wrap(column)
-        end
-
-        def references_column_names
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_column_names is deprecated, use Array.wrap(primary_key)"
-          Array.wrap(primary_key)
-        end
-
-        def references_table_name
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#references_table_name is deprecated, use #to_table"
-          to_table
-        end
-
-        def table_name
-          ActiveSupport::Deprecation.warn "ForeignKeyDefinition#table_name is deprecated, use #from_table"
-          from_table
-        end
-
-        ACTIONS = { :cascade => "CASCADE", :restrict => "RESTRICT", :nullify => "SET NULL", :set_default => "SET DEFAULT", :no_action => "NO ACTION" }.freeze
+        ACTIONS = { cascade: "CASCADE", restrict: "RESTRICT", nullify: "SET NULL", set_default: "SET DEFAULT", no_action: "NO ACTION" }.freeze
         ACTION_LOOKUP = ACTIONS.invert.freeze
 
         def initialize(from_table, to_table, options={})
@@ -88,7 +68,7 @@ module SchemaPlus::ForeignKeys
         end
 
         def to_sql
-          sql = name ? "CONSTRAINT #{name} " : ""
+          sql = name ? +"CONSTRAINT #{name} " : +""
           sql << "FOREIGN KEY (#{quoted_column_names.join(", ")}) REFERENCES #{quoted_to_table} (#{quoted_primary_keys.join(", ")})"
           sql << " ON UPDATE #{ACTIONS[on_update]}" if on_update
           sql << " ON DELETE #{ACTIONS[on_delete]}" if on_delete
@@ -109,17 +89,6 @@ module SchemaPlus::ForeignKeys
           ::ActiveRecord::Base.connection.quote_table_name(to_table)
         end
 
-        def self.default_name(from_table, column)
-          name = "fk_#{fixup_schema_name(from_table)}_#{Array.wrap(column).join('_and_')}"
-          name = name.slice(0, 27) + "_" + OpenSSL::Digest::MD5.new.hexdigest(name) if name.length > 60
-          name
-        end
-
-        def self.fixup_schema_name(table_name)
-          # replace . with _
-          table_name.to_s.gsub(/[.]/, '_')
-        end
-
         def match(test)
           return false unless from_table == test.from_table
           [:to_table, :column].reject{ |attr| test.send(attr).blank? }.all? { |attr|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::ForeignKeys
   module ActiveRecord
     module ConnectionAdapters
@@ -7,27 +9,24 @@ module SchemaPlus::ForeignKeys
 
         #:enddoc:
 
-        def remove_column(table_name, column_name, type=nil, options={})
+        def remove_column(table_name, column_name, type=nil, **options)
           foreign_keys(table_name).select { |foreign_key| Array.wrap(foreign_key.column).include?(column_name.to_s) }.each do |foreign_key|
             remove_foreign_key(table_name, name: foreign_key.name)
           end
-          super table_name, column_name, type, options
+          super table_name, column_name, type, **options
         end
 
-        def remove_foreign_key(*args)
-          from_table, to_table, options = normalize_remove_foreign_key_args(*args)
+        def remove_foreign_key(from_table, to_table = nil, **options)
           if options[:if_exists]
             foreign_key_name = get_foreign_key_name(from_table, to_table, options)
             return if !foreign_key_name or not foreign_keys(from_table).detect{|fk| fk.name == foreign_key_name}
           end
           options.delete(:if_exists)
-          super from_table, to_table, options
+          super from_table, to_table, **options
         end
 
         def remove_foreign_key_sql(*args)
-          super.tap { |ret|
-            ret.sub!(/DROP CONSTRAINT/, 'DROP FOREIGN KEY') if ret
-          }
+          super&.sub(/DROP CONSTRAINT/, 'DROP FOREIGN KEY')
         end
 
         def foreign_keys(table_name, name = nil)
@@ -52,11 +51,11 @@ module SchemaPlus::ForeignKeys
                 on_update = ForeignKeyDefinition::ACTION_LOOKUP[on_update] || :restrict
                 on_delete = ForeignKeyDefinition::ACTION_LOOKUP[on_delete] || :restrict
 
-                options = { :name => name,
-                            :on_delete => on_delete,
-                            :on_update => on_update,
-                            :column => columns.gsub('`', '').split(', '),
-                            :primary_key => primary_keys.gsub('`', '').split(', ')
+                options = { name: name,
+                            on_delete: on_delete,
+                            on_update: on_update,
+                            column: columns.gsub('`', '').split(', '),
+                            primary_key: primary_keys.gsub('`', '').split(', ')
                 }
 
                 foreign_keys << ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(
@@ -92,9 +91,9 @@ module SchemaPlus::ForeignKeys
             to_table = table_namespace_prefix(to_table) + to_table
 
             options = {
-              :name => constraint_name,
-              :column => columns.map { |row| row['column_name'] },
-              :primary_key => columns.map { |row| row['referenced_column_name'] }
+              name: constraint_name,
+              column: columns.map { |row| row['column_name'] },
+              primary_key: columns.map { |row| row['referenced_column_name'] }
             }
 
             ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(from_table, to_table, options)