schema_auto_foreign_keys 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4341d0ec0137c4eee6b3f89abfa752536f3af622
-  data.tar.gz: 3cdd82f4202e857413b00f29fbf5de7c234801fb
+SHA256:
+  metadata.gz: fa12ac616f5ce5677d2c2bea13ad20164b80adf764066679627ef3e2eec1409d
+  data.tar.gz: 8188e920c5d2ba40309203bccba5665ca332fe0b12887c130688aa9894143d25
 SHA512:
-  metadata.gz: 7fb530f92d3392f2591792926a4baf5b74238a8d18362da8a5283c07315fc0e10a9e3f684812e6c95e16ef588a2cd1a005e7009c359de5cae705afe816e891a8
-  data.tar.gz: b0b2514869d54c7d93a79f9a932ecedd19c3abc133c7fdaa2e34636e2dc25b6ea49eedde79bfbba16954eed052b56df3735fe96d0dc3393bc0ad6caabe227bbd
+  metadata.gz: 0cef6379c1877ec78c61f0e6a8a807b6892c6ce2396a1e59b15fd0f00b5f1d35b0fc621469f6aaf131b12bd98a238aa955460c70ae597a3d167714716ce26456
+  data.tar.gz: 11d4059f62fca77a85d7c59fa0a91795d800be76dd0a57be95d9257e7147304c567b2176fb34ebe36ac0bbaca4c1d9259327bad47b0b8ff4aace56e0d084fb5c

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/.simplecov

@@ -0,0 +1,19 @@
+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

@@ -2,4 +2,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

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_auto_foreign_keys.svg)](http://badge.fury.io/rb/schema_auto_foreign_keys)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_auto_foreign_keys.svg)](http://travis-ci.org/SchemaPlus/schema_auto_foreign_keys)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_auto_foreign_keys.svg)](https://coveralls.io/r/SchemaPlus/schema_auto_foreign_keys)
-[![Dependency Status](https://gemnasium.com/lomba/schema_auto_foreign_keys.svg)](https://gemnasium.com/SchemaPlus/schema_auto_foreign_keys)
+[![Build Status](https://github.com/SchemaPlus/schema_auto_foreign_keys/actions/workflows/prs.yml/badge.svg)](https://github.com/SchemaPlus/schema_auto_foreign_keys/actions)
+[![Coverage Status](https://coveralls.io/repos/github/SchemaPlus/schema_auto_foreign_keys/badge.svg?branch=master)](https://coveralls.io/github/SchemaPlus/schema_auto_foreign_keys?branch=master)
 
 # SchemaAutoForeignKeys
 
@@ -36,7 +35,7 @@ There is actually one difference between an auto-created index and specifying `i
 If you need specific paramaters other than the default, you can of course specify them:
 
 ```ruby
-t.integer :user_id, index: :unique  # "has one" relationship between users and this 
+t.integer :user_id, index: :unique  # "has one" relationship between users and this
 model
 t.integer :user_id, on_delete: :cascade
 ```
@@ -88,8 +87,11 @@ SchemaAutoForeignKeys 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**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.0**, 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 -->
 
@@ -103,6 +105,7 @@ SQlite3 doesn't support renaming the auto-index whtn the table name changes.
 
 ## History
 
+* 1.0.0 - Drop Ruby < 2.5 and Rails < 5.2, add Rails 6.0, and remove many deprecations
 * 0.1.3 - AR5 (Rails 5) Support
 * 0.1.2 - Missing require
 * 0.1.1 - Explicit gem dependencies
@@ -121,7 +124,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaAutoForeignKeys 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_auto_foreign_keys)
+  [github actions](https://github.com/SchemaPlus/schema_auto_foreign_keys/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -133,7 +136,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 -->
 
 

data/Rakefile

@@ -3,7 +3,7 @@ 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

@@ -0,0 +1,4 @@
+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

@@ -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-5.2/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 → 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_auto_foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb

@@ -7,7 +7,7 @@ module SchemaAutoForeignKeys
       module Sqlite3Adapter
 
         def copy_table(*args, &block)
-          fk_override = { :auto_create => false, :auto_index => false }
+          fk_override = { auto_create: false, auto_index: false }
           save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
           begin
             SchemaPlus::ForeignKeys.config.update_attributes(fk_override)

data/lib/schema_auto_foreign_keys/middleware/migration.rb

@@ -23,14 +23,14 @@ module SchemaAutoForeignKeys
           oldname = env.table_name
           indexes = env.connection.indexes(newname)
           env.connection.foreign_keys(newname).each do |fk|
-            index = indexes.find(&its.name == AutoCreate.auto_index_name(oldname, fk.column))
+            index = indexes.find { |it| it.name == AutoCreate.auto_index_name(oldname, fk.column) }
             env.connection.rename_index(newname, index.name, AutoCreate.auto_index_name(newname, index.columns)) if index
           end
         end
       end
     end
   end
-  
+
   module AutoCreate
     def before(env)
       config ||= env.caller.try(:schema_plus_foreign_keys_config) || SchemaPlus::ForeignKeys.config
@@ -69,7 +69,7 @@ module SchemaAutoForeignKeys
     end
 
     def remove_auto_index(env)
-      env.caller.remove_index(env.table_name, :name => auto_index_name(env), :column => env.column_name, :if_exists => true)
+      env.caller.remove_index(env.table_name, name: auto_index_name(env), column: env.column_name, if_exists: true)
     end
 
     def auto_index_name(env)

data/lib/schema_auto_foreign_keys/middleware/schema.rb

@@ -3,7 +3,7 @@ module SchemaAutoForeignKeys
     module Schema
       module Define
         def around(env)
-          fk_override = { :auto_create => false, :auto_index => false }
+          fk_override = { auto_create: false, auto_index: false }
           save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
           begin
             SchemaPlus::ForeignKeys.config.update_attributes(fk_override)

data/lib/schema_auto_foreign_keys/version.rb

@@ -1,3 +1,3 @@
 module SchemaAutoForeignKeys
-  VERSION = "0.1.3"
+  VERSION = "1.0.0"
 end

data/lib/schema_auto_foreign_keys.rb

@@ -1,6 +1,5 @@
 require 'schema_plus/foreign_keys'
 require 'schema_plus/indexes'
-require 'its-it'
 
 require_relative 'schema_auto_foreign_keys/middleware/migration'
 require_relative 'schema_auto_foreign_keys/middleware/schema'
@@ -19,14 +18,14 @@ class SchemaPlus::ForeignKeys::Config
     #
     # Whether to automatically create foreign key constraints for columns
     # suffixed with +_id+.  Boolean, default is +true+.
-    has_value :auto_create, :klass => :boolean, :default => true
+    has_value :auto_create, klass: :boolean, default: true
 
     ##
     # :attr_accessor: auto_index
     #
     # Whether to automatically create indexes when creating foreign key constraints for columns.
     # Boolean, default is +true+.
-    has_value :auto_index, :klass => :boolean, :default => true
+    has_value :auto_index, klass: :boolean, default: true
 end
 
 SchemaMonkey.register SchemaAutoForeignKeys

data/schema_auto_foreign_keys.gemspec

@@ -18,14 +18,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "schema_plus_foreign_keys", "~> 0.1"
-  gem.add_dependency "schema_plus_indexes", "~> 0.2"
-  gem.add_dependency "its-it", "~> 1.2"
+  gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_dependency "schema_plus_foreign_keys", "~> 1.0.0"
+  gem.add_dependency "schema_plus_indexes", "~> 1.0.0"
+
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "schema_dev", "~> 3.5"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "schema_dev", "~> 4.1"
 end

data/schema_dev.yml

@@ -1,8 +1,10 @@
 ruby:
-    - 2.3.1
+    - 2.5
+    - 2.7
+    - 3.0
 activerecord:
-    - 4.2
-    - 5.0
+    - 5.2
+    - 6.0
 db:
     - mysql2
     - sqlite3

data/spec/migration_spec.rb

@@ -7,7 +7,7 @@ describe ActiveRecord::Migration do
     define_schema do
 
       create_table :users do |t|
-        t.string :login, :index => { :unique => true }
+        t.string :login, index: { unique: true}
       end
 
       create_table :members do |t|
@@ -17,8 +17,8 @@ describe ActiveRecord::Migration do
       create_table :comments do |t|
         t.string :content
         t.integer :user
-        t.integer :user_id
-        t.foreign_key :user_id, :users, :primary_key => :id
+        t.bigint :user_id
+        t.foreign_key :users, column: :user_id
       end
 
       create_table :posts do |t|
@@ -28,10 +28,13 @@ describe ActiveRecord::Migration do
     class User < ::ActiveRecord::Base ; end
     class Post < ::ActiveRecord::Base ; end
     class Comment < ::ActiveRecord::Base ; end
+    User.reset_column_information
+    Post.reset_column_information
+    Comment.reset_column_information
   end
 
   around(:each) do |example|
-    with_fk_config(:auto_create => true, :auto_index => true) { example.run }
+    with_fk_config(auto_create: true, auto_index: true) { example.run }
   end
 
   context "when table is created" do
@@ -42,14 +45,14 @@ describe ActiveRecord::Migration do
 
     it "creates auto foreign keys" do
       create_table(@model) do |t|
-        t.integer :user_id
+        t.bigint :user_id
       end
       expect(@model).to reference(:users, :id).on(:user_id)
     end
 
     it "respects explicit foreign key" do
       create_table(@model) do |t|
-        t.integer :author_id, :foreign_key => { :references => :users }
+        t.bigint :author_id, foreign_key: { references: :users }
       end
       expect(@model).to reference(:users, :id).on(:author_id)
       expect(@model).to have_index.on(:author_id)
@@ -57,7 +60,7 @@ describe ActiveRecord::Migration do
 
     it "suppresses auto foreign key" do
       create_table(@model) do |t|
-        t.integer :member_id, :foreign_key => false
+        t.bigint :member_id, foreign_key: false
       end
       expect(@model).not_to reference.on(:member_id)
       expect(@model).not_to have_index.on(:member_id)
@@ -65,7 +68,7 @@ describe ActiveRecord::Migration do
 
     it "suppresses auto foreign key using shortcut" do
       create_table(@model) do |t|
-        t.integer :member_id, :references => nil
+        t.bigint :member_id, references: nil
       end
       expect(@model).not_to reference.on(:member_id)
       expect(@model).not_to have_index.on(:member_id)
@@ -85,12 +88,12 @@ describe ActiveRecord::Migration do
         end
 
         it "does not create a foreign_key if polymorphic" do
-          create_reference(reftype, :post, :polymorphic => true)
+          create_reference(reftype, :post, polymorphic: true)
           expect(@model).not_to reference(:posts, :id).on(:post_id)
         end
 
-        it "does not create a foreign_key with :foreign_key => false" do
-          create_reference(reftype, :post, :foreign_key => false)
+        it "does not create a foreign_key with foreign_key: false" do
+          create_reference(reftype, :post, foreign_key: false)
           expect(@model).not_to reference(:posts, :id).on(:post_id)
         end
 
@@ -100,25 +103,25 @@ describe ActiveRecord::Migration do
         end
 
         it "should create exactly one index explicitly (#157)" do
-          create_reference(reftype, :post, :index => true)
+          create_reference(reftype, :post, index: true)
           expect(@model).to have_index.on(:post_id)
         end
 
         it "should respect :unique (#157)" do
-          create_reference(reftype, :post, :index => :unique)
+          create_reference(reftype, :post, index: :unique)
           expect(@model).to have_unique_index.on(:post_id)
         end
 
         it "should create a two-column index if polymophic and index requested" do
-          create_reference(reftype, :post, :polymorphic => true, :index => true)
+          create_reference(reftype, :post, polymorphic: true, index: true)
           expect(@model).to have_index.on([:post_id, :post_type])
         end
 
         protected
 
-        def create_reference(reftype, column_name, *args)
+        def create_reference(reftype, column_name, **kwargs)
           create_table(@model) do |t|
-            t.send reftype, column_name, *args
+            t.send reftype, column_name, **kwargs.merge(type: :bigint)
           end
         end
 
@@ -127,9 +130,9 @@ describe ActiveRecord::Migration do
 
     it "creates auto-index on foreign keys only" do
       create_table(@model) do |t|
-        t.integer :user_id
-        t.integer :application_id, :references => nil
-        t.integer :state
+        t.bigint :user_id
+        t.bigint :application_id, references: nil
+        t.bigint :state
       end
       expect(@model).to have_index.on(:user_id)
       expect(@model).not_to have_index.on(:application_id)
@@ -141,52 +144,52 @@ describe ActiveRecord::Migration do
       column = ("co"*15 + "_id")
       expect {
         ActiveRecord::Migration.create_table table do |t|
-          t.integer column, foreign_key: { references: :members, name: "verylong" }
+          t.bigint column, foreign_key: { references: :members, name: "verylong" }
         end
       }.not_to raise_error
       expect(ActiveRecord::Base.connection.indexes(table).first.columns.first).to eq column
     end
 
     it "overrides foreign key auto_create positively" do
-      with_fk_config(:auto_create => false) do
-        create_table @model, :foreign_keys => {:auto_create => true} do |t|
-          t.integer :user_id
+      with_fk_config(auto_create: false) do
+        create_table @model, foreign_keys: { auto_create: true } do |t|
+          t.bigint :user_id
         end
         expect(@model).to reference(:users, :id).on(:user_id)
       end
     end
 
     it "overrides foreign key auto_create negatively" do
-      with_fk_config(:auto_create => true) do
-        create_table @model, :foreign_keys => {:auto_create => false} do |t|
-          t.integer :user_id
+      with_fk_config(auto_create: true) do
+        create_table @model, foreign_keys: { auto_create: false } do |t|
+          t.bigint :user_id
         end
         expect(@model).not_to reference.on(:user_id)
       end
     end
 
     it "overrides foreign key auto_index positively" do
-      with_fk_config(:auto_index => false) do
-        create_table @model, :foreign_keys => {:auto_index => true} do |t|
-          t.integer :user_id
+      with_fk_config(auto_index: false) do
+        create_table @model, foreign_keys: { auto_index: true } do |t|
+          t.bigint :user_id
         end
         expect(@model).to have_index.on(:user_id)
       end
     end
 
-    it "overrides foreign key auto_index negatively", :mysql => :skip do
-      with_fk_config(:auto_index => true) do
-        create_table @model, :foreign_keys => {:auto_index => false} do |t|
-          t.integer :user_id
+    it "overrides foreign key auto_index negatively", mysql: :skip do
+      with_fk_config(auto_index: true) do
+        create_table @model, foreign_keys: { auto_index: false } do |t|
+          t.bigint :user_id
         end
         expect(@model).not_to have_index.on(:user_id)
       end
     end
 
-    it "disables auto-index for a column", :mysql => :skip do
-      with_fk_config(:auto_index => true) do
+    it "disables auto-index for a column", mysql: :skip do
+      with_fk_config(auto_index: true) do
         create_table @model do |t|
-          t.integer :user_id, :index => false
+          t.bigint :user_id, index: false
         end
         expect(@model).not_to have_index.on(:user_id)
       end
@@ -194,7 +197,7 @@ describe ActiveRecord::Migration do
 
   end
 
-  context "when table is changed", :sqlite3 => :skip do
+  context "when table is changed", sqlite3: :skip do
     before(:each) do
       @model = Post
     end
@@ -202,8 +205,10 @@ describe ActiveRecord::Migration do
       suffix = bulk ? ' with :bulk option' : ""
 
       it "auto creates a foreign key constraint"+suffix do
-        change_table(@model, :bulk => bulk) do |t|
-          t.integer :user_id
+        # https://github.com/rails/rails/pull/35958 was never backported to Rails 5.2
+        skip("Not supported on MySQL with Rails 5.2") if bulk && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::Base.connection.adapter_name == "Mysql2"
+        change_table(@model, bulk: bulk) do |t|
+          t.bigint :user_id
         end
         expect(@model).to reference(:users, :id).on(:user_id)
       end
@@ -211,14 +216,14 @@ describe ActiveRecord::Migration do
       context "migrate down" do
         it "removes an auto foreign key and index"+suffix do
           create_table Comment do |t|
-            t.integer :user_id
+            t.bigint :user_id
           end
           expect(Comment).to reference(:users, :id).on(:user_id)
           expect(Comment).to have_index.on(:user_id)
           migration = Class.new ::ActiveRecord::Migration.latest_version do
             define_method(:change) {
-              change_table("comments", :bulk => bulk) do |t|
-                t.integer :user_id
+              change_table("comments", bulk: bulk) do |t|
+                t.bigint :user_id
               end
             }
           end
@@ -231,83 +236,83 @@ describe ActiveRecord::Migration do
     end
   end
 
-  context "when table is renamed", :postgresql => :only do
+  context "when table is renamed", postgresql: :only do
 
     before(:each) do
       @model = Comment
       create_table @model do |t|
-        t.integer :user_id
-        t.integer :xyz, :index => true
+        t.bigint :user_id
+        t.bigint :xyz, index: true
       end
       ActiveRecord::Migration.rename_table @model.table_name, :newname
     end
 
     it "should rename fk indexes" do
-      index = ActiveRecord::Base.connection.indexes(:newname).find(&its.columns == ['user_id'])
+      index = ActiveRecord::Base.connection.indexes(:newname).find { |it| it.columns == ['user_id'] }
       expect(index.name).to match(/^fk__newname_/)
     end
 
   end
 
-  context "when column is added", :sqlite3 => :skip do
+  context "when column is added", sqlite3: :skip do
 
     before(:each) do
       @model = Comment
     end
 
     it "auto creates foreign key" do
-      add_column(:post_id, :integer) do
+      add_column(:post_id, :bigint) do
         expect(@model).to reference(:posts, :id).on(:post_id)
       end
     end
 
     it "respects explicit foreign key" do
-      add_column(:author_id, :integer, :foreign_key => { :references => :users }) do
+      add_column(:author_id, :bigint, foreign_key: { references: :users }) do
         expect(@model).to reference(:users, :id).on(:author_id)
       end
     end
 
     it "doesn't create foreign key if column doesn't look like foreign key" do
-      add_column(:views_count, :integer) do
+      add_column(:views_count, :bigint) do
         expect(@model).not_to reference.on(:views_count)
       end
     end
 
     it "doesn't create foreign key if declined explicitly" do
-      add_column(:post_id, :integer, :foreign_key => false) do
+      add_column(:post_id, :bigint, foreign_key: false) do
         expect(@model).not_to reference.on(:post_id)
       end
     end
 
     it "shouldn't create foreign key if declined explicitly by shorthand" do
-      add_column(:post_id, :integer, :references => nil) do
+      add_column(:post_id, :bigint, references: nil) do
         expect(@model).not_to reference.on(:post_id)
       end
     end
 
     it "creates auto index" do
-      add_column(:post_id, :integer) do
+      add_column(:post_id, :bigint) do
         expect(@model).to have_index.on(:post_id)
       end
     end
 
     it "does not create auto-index for non-foreign keys" do
-      add_column(:state, :integer) do
+      add_column(:state, :bigint) do
         expect(@model).not_to have_index.on(:state)
       end
     end
 
     # MySQL creates an index on foreign key and we can't override that
-    it "doesn't create auto-index if declined explicitly", :mysql => :skip do
-      add_column(:post_id, :integer, :index => false) do
+    it "doesn't create auto-index if declined explicitly", mysql: :skip do
+      add_column(:post_id, :bigint, index: false) do
         expect(@model).not_to have_index.on(:post_id)
       end
     end
 
     protected
-    def add_column(column_name, *args)
+    def add_column(column_name, type, **kwargs)
       table = @model.table_name
-      ActiveRecord::Migration.add_column(table, column_name, *args)
+      ActiveRecord::Migration.add_column(table, column_name, type, **kwargs)
       @model.reset_column_information
       yield if block_given?
       ActiveRecord::Migration.remove_column(table, column_name)
@@ -321,13 +326,13 @@ describe ActiveRecord::Migration do
       @model = Comment
     end
 
-    context "with foreign keys", :sqlite3 => :skip do
+    context "with foreign keys", sqlite3: :skip do
 
       context "and initially references to users table" do
 
         before(:each) do
           create_table @model do |t|
-            t.integer :user_id
+            t.bigint :user_id
           end
         end
 
@@ -336,13 +341,13 @@ describe ActiveRecord::Migration do
         end
 
         it "should drop foreign key if requested to do so" do
-          change_column :user_id, :integer, :foreign_key => { :references => nil }
+          change_column :user_id, :bigint, foreign_key: { references: nil }
           expect(@model).not_to reference(:users)
         end
 
-        it "should remove auto-created index if foreign key is removed", :mysql => :skip do
+        it "should remove auto-created index if foreign key is removed", mysql: :skip do
           expect(@model).to have_index.on(:user_id)  # sanity check that index was auto-created
-          change_column :user_id, :integer, :foreign_key => { :references => nil }
+          change_column :user_id, :bigint, foreign_key: { references: nil }
           expect(@model).not_to have_index.on(:user_id)
         end
 
@@ -351,7 +356,7 @@ describe ActiveRecord::Migration do
       context "if column defined without foreign key but with index" do
         before(:each) do
           create_table @model do |t|
-            t.integer :user_id, :foreign_key => false, :index => true
+            t.bigint :user_id, foreign_key: false, index: true
           end
         end
 
@@ -360,7 +365,7 @@ describe ActiveRecord::Migration do
         end
 
         it "adding foreign key should not fail due to attempt to auto-create existing index" do
-          expect { change_column :user_id, :integer, :foreign_key => true }.to_not raise_error
+          expect { change_column :user_id, :bigint, foreign_key: true }.to_not raise_error
         end
       end
     end
@@ -369,7 +374,7 @@ describe ActiveRecord::Migration do
 
       it "doesn't auto-add foreign keys" do
         create_table @model do |t|
-          t.integer :user_id, :foreign_key => false
+          t.bigint :user_id, foreign_key: false
           t.string :other_column
         end
         with_fk_auto_create do
@@ -381,23 +386,22 @@ describe ActiveRecord::Migration do
     end
 
     protected
-    def change_column(column_name, *args)
+    def change_column(column_name, type, **kwargs)
       table = @model.table_name
-      ActiveRecord::Migration.change_column(table, column_name, *args)
+      ActiveRecord::Migration.change_column(table, column_name, type, **kwargs)
       @model.reset_column_information
     end
 
   end
 
   def create_table(model, opts={}, &block)
-    ActiveRecord::Migration.create_table model.table_name, opts.merge(:force => true), &block
+    ActiveRecord::Migration.create_table model.table_name, **opts.merge(force: true, id: :bigint), &block
     model.reset_column_information
   end
 
   def change_table(model, opts={}, &block)
-    ActiveRecord::Migration.change_table model.table_name, opts, &block
+    ActiveRecord::Migration.change_table model.table_name, **opts, &block
     model.reset_column_information
   end
 
 end
-

data/spec/schema_spec.rb

@@ -10,19 +10,19 @@ describe ActiveRecord::Schema do
       with_fk_config(auto_create: true, auto_index: true) do
         ActiveRecord::Schema.define do
 
-          create_table :users, :force => :cascade do
+          create_table :users, force: :cascade do
           end
 
-          create_table :colors, :force => :cascade do
+          create_table :colors, force: :cascade do
           end
 
-          create_table :shoes, :force => :cascade do
+          create_table :shoes, force: :cascade do
           end
 
-          create_table :posts, :force => true do |t|
-            t.integer :user_id, :references => :users, :index => true
-            t.integer :shoe_id, :references => :shoes   # should not have an index (except mysql)
-            t.integer :color_id   # should not have a foreign key nor index
+          create_table :posts, force: true do |t|
+            t.bigint :user_id, references: :users, index: true
+            t.bigint :shoe_id, references: :shoes   # should not have an index (except mysql)
+            t.bigint :color_id   # should not have a foreign key nor index
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 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'))
@@ -37,7 +36,7 @@ def with_fk_config(opts={}, &block)
 end
 
 def with_fk_auto_create(value = true, &block)
-  with_fk_config(:auto_create => value, &block)
+  with_fk_config(auto_create: value, &block)
 end
 
 def define_schema(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_auto_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_foreign_keys
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: its-it
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.0
 - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-- !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'
+        version: '4.1'
 description: In an ActiveRecord migration, set the default to create a foreign key
   and index for all columns that define relatoins.
 email:
@@ -144,21 +102,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-4.2/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
-- 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.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_auto_foreign_keys.rb
 - lib/schema_auto_foreign_keys/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_auto_foreign_keys/middleware/migration.rb
@@ -176,7 +135,7 @@ homepage: https://github.com/SchemaPlus/schema_auto_foreign_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,16 +143,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.5.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Automatically define foreign key constraints in ActiveRecord
 test_files:

data/.travis.yml

@@ -1,21 +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.3.1
-gemfile:
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/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-4.2/Gemfile.base

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

data/gemfiles/activerecord-4.2/Gemfile.mysql2

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

data/gemfiles/activerecord-4.2/Gemfile.postgresql

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

data/gemfiles/activerecord-5.0/Gemfile.base

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

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"
-end
-
-platform :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter'
-end