schema_plus_foreign_keys 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c82c1e41e5b9f6ca1cfb1f5d4df97db636f573f
-  data.tar.gz: ae9f1d6d16f4e77f36dd5b8246873b50da4d8ba8
+SHA256:
+  metadata.gz: 237f5ea4424fd65009b719b0f147d91f0bf3ddecd81cfca4ec385b45cfbea3a4
+  data.tar.gz: 82818ed615ce5ded6b395a5f9cef23e77560e316fa00b88579d2791c7b7a9d19
 SHA512:
-  metadata.gz: c88017019c8f44d10b3b833e8f19e1612f0311f5a07c0c05af87046c87e238081cfc0811af6e813a68365d523ec51c4343e7e6ebe30024cd3577c9f0aaef6e68
-  data.tar.gz: 12e0728c42a03ba247ddd28e3885e1cfc1f3948ecbb46bb10baafb389db218952358d0762c4e79ef5ddff280457fd63ba289cd1fb81258ea8c67190a42a90a0f
+  metadata.gz: 5a46e7c27b80fa7877ec1c788e8566e574b724d53ad676e5ae443c79668a545e569bb0dbf9ec28fcc137e44fc64b67b455a721d0b9d76cdff8cd90e6862bd9fe
+  data.tar.gz: 250f274ce03d0ceea35dccc7e1c9b4cc3775a6802a2a83f64028abd3e38b59cbf17fc502c282c1923389c6ff885c284f33f77c5b99f42d5dbcdb63c79fc08483

data/.travis.yml

@@ -19,6 +19,12 @@ 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'

data/README.md

@@ -31,41 +31,44 @@ gem.add_dependency "schema_plus_foreign_keys" # in a .gemspec
 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`:
 
-    t.integer :author_id, foreign_key: true           # create a foreign_key to table "authors"
-    t.integer :author_id, foreign_key: {}             # create a foreign_key to table "authors"
-    t.integer :author_id, foreign_key: false          # don't create a constraint (this is the default)
+    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"
+    t.references :author, foreign_key: false          # don't create a constraint (this is the default)
     t.integer :author,    foreign_key: true           # create a foreign_key to table "authors"
 
-    t.integer :parent_id, foreign_key: true           # special column parent_id defaults to referencing its own table
+    t.references :parent, foreign_key: true           # special column parent_id defaults to referencing its own table
 
 Specify the target table and its primary key using the `:references` and `:primary_key`:
 
-    t.integer :author_id, foreign_key: { references: :authors }        # the default
+    t.references :author, foreign_key: { references: :authors }        # the default
     t.integer :author,    foreign_key: { references: :authors }        # the default
-    t.integer :author_id, foreign_key: { references: :people }         # choose table name
-    t.integer :author_id, foreign_key: { primary_key: :ssn] }          # choose primary key
-    t.integer :author_id, foreign_key: { references: :people, primary_key: :ssn] } # choose both
-    t.integer :author_id, foreign_key: { references: [:people, :ssn] } # shortcut for both
-    t.integer :author_id, foreign_key: { references: nil }             # same as foreign_key: false
+    t.references :author, foreign_key: { references: :people }         # choose table name
+    t.references :author, foreign_key: { primary_key: :ssn] }          # choose primary key
+    t.references :author, foreign_key: { references: :people, primary_key: :ssn] } # choose both
+    t.references :author, foreign_key: { references: [:people, :ssn] } # shortcut for both
+    t.references :author, foreign_key: { references: nil }             # same as foreign_key: false
 
-You can also specify other attributes:
+You can also specify other attributes that are supported by Rails:
 
-    t.integer :author_id, foreign_key: { name: "my_fk" }               # override default auto-generated constraint name
-    t.integer :author_id, foreign_key: { on_delete: :cascade }
-    t.integer :author_id, foreign_key: { on_update: :set_null }
-    t.integer :author_id, foreign_key: { deferrable: true }
-    t.integer :author_id, foreign_key: { deferrable: :initially_deferred }
+    t.references :author, foreign_key: { name: "my_fk" }               # override default auto-generated constraint name
+    t.references :author, foreign_key: { on_delete: :cascade }
+    t.references :author, foreign_key: { on_update: :set_null }
+
+In addition, support for deferrable constraints is implemented:
+
+    t.references :author, foreign_key: { deferrable: true }
+    t.references :author, foreign_key: { deferrable: :initially_deferred }
 
 Of course the options can be combined:
 
-    t.integer :author_id, foreign_key: { references: :people, primary_key: :ssn, name: "my_fk", on_delet: :no_action }
+    t.references :author, foreign_key: { references: :people, primary_key: :ssn, name: "my_fk", on_delet: :no_action }
 
 
 As a shorthand, all options except `:name` can be specified without placing
 them in a `foreign_key` hash, e.g.
 
-    t.integer :author_id, on_delete: :cascade  # shorthand for foreign_key: { on_delete: :cascade }
-    t.integer :author_id, references: :people  # shorthand for foreign_key: { references: :people }
+    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)`
 
@@ -145,11 +148,14 @@ SchemaPlus::ForeignKeys is tested on:
 * 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**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+* 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
 * 0.1.5 - Explicit gem dependencies

data/gemfiles/activerecord-4.2.0/Gemfile.postgresql

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

data/gemfiles/activerecord-4.2.1/Gemfile.postgresql

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

data/gemfiles/activerecord-4.2.6/Gemfile.postgresql

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

data/gemfiles/activerecord-5.0/Gemfile.base

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

data/gemfiles/activerecord-5.0/Gemfile.postgresql

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

data/gemfiles/activerecord-5.1/Gemfile.base

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

data/gemfiles/activerecord-5.1/Gemfile.mysql2

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

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

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

data/gemfiles/activerecord-5.2/Gemfile.base

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

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+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.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+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.2/Gemfile.sqlite3

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

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

@@ -34,17 +34,17 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
   # SchemaPlus::ForeignKeys also supports creation of foreign key constraints analogously, using Migration::ClassMethods#add_foreign_key or TableDefinition#foreign_key or as part of the column definition, for example:
   #
   #    create_table :posts do |t|  # not DRY
-  #       t.integer :author_id
+  #       t.references :author
   #    end
   #    add_foreign_key :posts, :author_id, :references => :authors
   #
   #    create_table :posts do |t|  # DRYer
-  #       t.integer :author_id
+  #       t.references :author
   #       t.foreign_key :author_id, :references => :authors
   #    end
   #
   #    create_table :posts do |t|  # Dryest
-  #       t.integer :author_id, :foreign_key => true
+  #       t.references :author, :foreign_key => true
   #    end
   #
   # <b>NOTE:</b> In the standard configuration, SchemaPlus::ForeignKeys automatically
@@ -60,7 +60,7 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
   # basis by passing Config options to Migration::ClassMethods#create_table, such as
   #
   #      create_table :students, :foreign_keys => {:auto_create => false} do
-  #         t.integer :student_id
+  #         t.references :student
   #      end
   #
   module TableDefinition

data/lib/schema_plus/foreign_keys/middleware/sql.rb

@@ -2,7 +2,7 @@ module SchemaPlus::ForeignKeys
   module Middleware
     module Sql
       module Table
-        if Gem::Requirement.new('< 5.0.0.alpha.1').satisfied_by?(::ActiveRecord.version)
+        if Gem::Requirement.new('< 5.0').satisfied_by?(::ActiveRecord.version)
           def after(env)
             foreign_keys = if env.table_definition.foreign_keys.is_a? Array
                              env.table_definition.foreign_keys

data/lib/schema_plus/foreign_keys/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module ForeignKeys
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/schema_dev.yml

@@ -5,6 +5,8 @@ activerecord:
     - 4.2.1
     - 4.2.6
     - 5.0
+    - 5.1
+    - 5.2
 db:
     - mysql2
     - sqlite3

data/schema_plus_foreign_keys.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", ">= 4.2", "< 5.1"
+  gem.add_dependency "activerecord", ">= 4.2", "< 5.3"
   gem.add_dependency "schema_plus_core"
   gem.add_dependency "schema_plus_compatibility", "~> 0.2"
   gem.add_dependency "valuable"

data/spec/deprecation_spec.rb

@@ -9,7 +9,7 @@ describe 'Deprecations' do
       define_schema do
         create_table :posts
         create_table :comments do |t|
-          t.integer :post_id
+          t.references :post
         end
       end
       class Comment < ::ActiveRecord::Base ; end
@@ -28,7 +28,7 @@ describe 'Deprecations' do
       define_schema do
         create_table :posts
         create_table :comments do |t|
-          t.integer :post_id, foreign_key: true
+          t.references :post, foreign_key: true
         end
       end
       class Comment < ::ActiveRecord::Base ; end
@@ -89,7 +89,7 @@ describe 'Deprecations' do
       define_schema do
         create_table :posts
         create_table :comments do |t|
-          t.integer :post_id, foreign_key: true
+          t.references :post, foreign_key: true
         end
       end
       class Comment < ::ActiveRecord::Base ; end
@@ -126,7 +126,7 @@ describe 'Deprecations' do
       define_schema do
         create_table :posts
         create_table :comments do |t|
-          t.integer :post_id, references: :posts, on_delete: :set_null
+          t.references :post, references: :posts, on_delete: :set_null
         end
       end
       expect(definition.on_delete).to eq(:nullify)
@@ -141,7 +141,7 @@ describe 'Deprecations' do
       define_schema do
         create_table :posts, primary_key: :funky
         create_table :comments do |t|
-          t.integer :post_id
+          t.references :post
           t.foreign_key :post_id, :posts, :funky
         end
       end
@@ -153,7 +153,7 @@ describe 'Deprecations' do
         define_schema do
           create_table :posts, primary_key: :funky
           create_table :comments do |t|
-            t.integer :post_id
+            t.references :post
             t.foreign_key :post_id, :posts, :funky, :town
           end
         end

data/spec/foreign_key_spec.rb

@@ -11,7 +11,7 @@ describe "Foreign Key" do
           t.string :login
         end
         create_table :comments, :force => true do |t|
-          t.integer :user_id
+          t.references :user
           t.foreign_key :user_id, :users
         end
       end
@@ -41,13 +41,13 @@ describe "Foreign Key" do
 
         create_table :posts, :force => true do |t|
           t.text :body
-          t.integer :user_id
-          t.integer :author_id
+          t.references :user
+          t.references :author
         end
 
         create_table :comments, :force => true do |t|
           t.text :body
-          t.integer :post_id
+          t.references :post
           t.foreign_key :post_id, :posts
         end
       end
@@ -150,7 +150,7 @@ describe "Foreign Key" do
         before(:each) do
           migration.suppress_messages do
             migration.create_table :references, :force => true do |t|
-              t.integer :post_id, :foreign_key => false
+              t.references :post, :foreign_key => false
             end
           end
         end

data/spec/migration_spec.rb

@@ -2,6 +2,9 @@
 require 'spec_helper'
 
 describe ActiveRecord::Migration do
+  let(:column_type) {
+    Gem::Requirement.new('< 5.1').satisfied_by?(::ActiveRecord.version) ? :integer : :bigint
+  }
 
   before(:each) do
     define_schema do
@@ -17,7 +20,7 @@ describe ActiveRecord::Migration do
       create_table :comments, :force => true do |t|
         t.string :content
         t.integer :user
-        t.integer :user_id
+        t.references :user
         t.foreign_key :user_id, :users, :primary_key => :id
       end
 
@@ -40,21 +43,21 @@ describe ActiveRecord::Migration do
       sql = []
       allow(@model.connection).to receive(:execute) { |str| sql << str }
       recreate_table(@model) do |t|
-        t.integer :user, :foreign_key => true
+        t.send column_type, :user, :foreign_key => true
       end
       expect(sql.join('; ')).to match(/PRAGMA FOREIGN_KEYS = ON.*CREATE TABLE "posts"/)
     end
 
     it "should create foreign key with default reference" do
       recreate_table(@model) do |t|
-        t.integer :user, :foreign_key => true
+        t.send column_type, :user, :foreign_key => true
       end
       expect(@model).to reference(:users, :id).on(:user)
     end
 
     it "should create foreign key with default column" do
       recreate_table(@model) do |t|
-        t.integer :user_id
+        t.references :user
         t.foreign_key :users
       end
       expect(@model).to reference(:users, :id).on(:user_id)
@@ -62,7 +65,7 @@ describe ActiveRecord::Migration do
 
     it "should create foreign key with different reference" do
       recreate_table(@model) do |t|
-        t.integer :author_id, :foreign_key => { :references => :users }
+        t.references :author, :foreign_key => { :references => :users }
       end
       expect(@model).to reference(:users, :id).on(:author_id)
     end
@@ -71,7 +74,7 @@ describe ActiveRecord::Migration do
       hash = { :references => :users }
       hash_original = hash.dup
       recreate_table(@model) do |t|
-        t.integer :author_id, :foreign_key => hash
+        t.references :author, :foreign_key => hash
       end
       expect(hash).to eq(hash_original)
     end
@@ -87,40 +90,40 @@ describe ActiveRecord::Migration do
 
     it "should create foreign key with different reference using shortcut" do
       recreate_table(@model) do |t|
-        t.integer :author_id, :references => :users
+        t.references :author, :references => :users
       end
       expect(@model).to reference(:users, :id).on(:author_id)
     end
 
     it "should create foreign key with default name" do
       recreate_table @model do |t|
-        t.integer :user_id, :foreign_key => true
+        t.references :user, :foreign_key => true
       end
       expect(@model).to reference(:users, :id).with_name("fk_#{@model.table_name}_user_id")
     end
 
     it "should create foreign key with specified name" do
       recreate_table @model do |t|
-        t.integer :user_id, :foreign_key => { :name => "wugga" }
+        t.references :user, :foreign_key => { :name => "wugga" }
       end
       expect(@model).to reference(:users, :id).with_name("wugga")
     end
 
     it "handles very long names" do
       table = ("ta"*15)
-      column = ("co"*15 + "_id")
+      column = ("co"*15)
       expect {
         ActiveRecord::Migration.create_table table do |t|
-          t.integer column, references: :members
+          t.references column, references: :members, index: false
         end
       }.not_to raise_error
-      expect(ActiveRecord::Base.connection.foreign_keys(table).first.column).to eq(column)
+      expect(ActiveRecord::Base.connection.foreign_keys(table).first.column).to eq(column + "_id")
     end
 
     it "should allow multiple foreign keys to be made" do
       recreate_table(@model) do |t|
-        t.integer :user_id, :references => :users
-        t.integer :updater_id, :references => :users
+        t.references :user, :references => :users
+        t.references :updater, :references => :users
       end
       expect(@model).to reference(:users, :id).on(:user_id)
       expect(@model).to reference(:users, :id).on(:updater_id)
@@ -128,14 +131,14 @@ describe ActiveRecord::Migration do
 
     it "should suppress foreign key" do
       recreate_table(@model) do |t|
-        t.integer :member_id, :foreign_key => false
+        t.references :member, :foreign_key => false
       end
       expect(@model).not_to reference.on(:member_id)
     end
 
     it "should suppress foreign key using shortcut" do
       recreate_table(@model) do |t|
-        t.integer :member_id, :references => nil
+        t.references :member, :references => nil
       end
       expect(@model).not_to reference.on(:member_id)
     end
@@ -177,7 +180,7 @@ describe ActiveRecord::Migration do
 
     it "should create foreign key to the same table on parent_id" do
       recreate_table(@model) do |t|
-        t.integer :parent_id, foreign_key: true
+        t.references :parent, foreign_key: true
       end
       expect(@model).to reference(@model.table_name, :id).on(:parent_id)
     end
@@ -195,14 +198,14 @@ describe ActiveRecord::Migration do
 
       it "should create and detect on_update #{action.inspect}", if_action_supported do
         recreate_table @model do |t|
-          t.integer :user_id,   :foreign_key => { :on_update => action }
+          t.references :user,   :foreign_key => { :on_update => action }
         end
         expect(@model).to reference.on(:user_id).on_update(action)
       end
 
       it "should create and detect on_update #{action.inspect} using shortcut", if_action_supported do
         recreate_table @model do |t|
-          t.integer :user_id,   :on_update => action
+          t.references :user,   :on_update => action
         end
         expect(@model).to reference.on(:user_id).on_update(action)
       end
@@ -210,21 +213,21 @@ describe ActiveRecord::Migration do
       it "should raise a not-implemented error for on_update => #{action}", if_action_unsupported do
         expect {
           recreate_table @model do |t|
-            t.integer :user_id, :foreign_key => { :on_update => action }
+            t.references :user, :foreign_key => { :on_update => action }
           end
         }.to raise_error(NotImplementedError)
       end
 
       it "should create and detect on_delete #{action.inspect}", if_action_supported do
         recreate_table @model do |t|
-          t.integer :user_id,   :foreign_key => { :on_delete => action }
+          t.references :user,   :foreign_key => { :on_delete => action }
         end
         expect(@model).to reference.on(:user_id).on_delete(action)
       end
 
       it "should create and detect on_delete #{action.inspect} using shortcut", if_action_supported do
         recreate_table @model do |t|
-          t.integer :user_id,   :on_delete => action
+          t.references :user,   :on_delete => action
         end
         expect(@model).to reference.on(:user_id).on_delete(action)
       end
@@ -232,7 +235,7 @@ describe ActiveRecord::Migration do
       it "should raise a not-implemented error for on_delete => #{action}", if_action_unsupported do
         expect {
           recreate_table @model do |t|
-            t.integer :user_id, :foreign_key => { :on_delete => action }
+            t.references :user, :foreign_key => { :on_delete => action }
           end
         }.to raise_error(NotImplementedError)
       end
@@ -242,7 +245,7 @@ describe ActiveRecord::Migration do
     [false, true, :initially_deferred].each do |status|
       it "should create and detect deferrable #{status.inspect}", :mysql => :skip do
         recreate_table @model do |t|
-          t.integer :user_id,   :on_delete => :cascade, :deferrable => status
+          t.references :user,   :on_delete => :cascade, :deferrable => status
         end
         expect(@model).to reference.on(:user_id).deferrable(status)
       end
@@ -251,7 +254,7 @@ describe ActiveRecord::Migration do
     it "should use default on_delete action" do
       with_fk_config(:on_delete => :cascade) do
         recreate_table @model do |t|
-          t.integer :user_id, foreign_key: true
+          t.references :user, foreign_key: true
         end
         expect(@model).to reference.on(:user_id).on_delete(:cascade)
       end
@@ -260,7 +263,7 @@ describe ActiveRecord::Migration do
     it "should override on_update action per table" do
       with_fk_config(:on_update => :cascade) do
         recreate_table @model, :foreign_keys => {:on_update => :restrict} do |t|
-          t.integer :user_id, foreign_key: true
+          t.references :user, foreign_key: true
         end
         expect(@model).to reference.on(:user_id).on_update(:restrict)
       end
@@ -269,7 +272,7 @@ describe ActiveRecord::Migration do
     it "should override on_delete action per table" do
       with_fk_config(:on_delete => :cascade) do
         recreate_table @model, :foreign_keys => {:on_delete => :restrict} do |t|
-          t.integer :user_id, foreign_key: true
+          t.references :user, foreign_key: true
         end
         expect(@model).to reference.on(:user_id).on_delete(:restrict)
       end
@@ -278,7 +281,7 @@ describe ActiveRecord::Migration do
     it "should override on_update action per column" do
       with_fk_config(:on_update => :cascade) do
         recreate_table @model, :foreign_keys => {:on_update => :restrict} do |t|
-          t.integer :user_id, :foreign_key => { :on_update => :nullify }
+          t.references :user, :foreign_key => { :on_update => :nullify }
         end
         expect(@model).to reference.on(:user_id).on_update(:nullify)
       end
@@ -287,7 +290,7 @@ describe ActiveRecord::Migration do
     it "should override on_delete action per column" do
       with_fk_config(:on_delete => :cascade) do
         recreate_table @model, :foreign_keys => {:on_delete => :restrict} do |t|
-          t.integer :user_id, :foreign_key => { :on_delete => :nullify }
+          t.references :user, :foreign_key => { :on_delete => :nullify }
         end
         expect(@model).to reference.on(:user_id).on_delete(:nullify)
       end
@@ -296,7 +299,7 @@ describe ActiveRecord::Migration do
     it "should raise an error for an invalid on_update action" do
       expect {
         recreate_table @model do |t|
-          t.integer :user_id, :foreign_key => { :on_update => :invalid }
+          t.references :user, :foreign_key => { :on_update => :invalid }
         end
       }.to raise_error(ArgumentError)
     end
@@ -304,7 +307,7 @@ describe ActiveRecord::Migration do
     it "should raise an error for an invalid on_delete action" do
       expect {
         recreate_table @model do |t|
-          t.integer :user_id, :foreign_key => { :on_delete => :invalid }
+          t.references :user, :foreign_key => { :on_delete => :invalid }
         end
       }.to raise_error(ArgumentError)
     end
@@ -315,12 +318,15 @@ describe ActiveRecord::Migration do
     before(:each) do
       @model = Post
     end
-    [false, true].each do |bulk|
+    # Disabling bulk tests on mysql since the mysql adapter does not implement it for add_foreign_key in rails 5.1+
+    bulk_tests = RSpec.configuration.exclusion_filter[:mysql] == :skip ? [false] : [true, false]
+
+    bulk_tests.each do |bulk|
       suffix = bulk ? ' with :bulk option' : ""
 
       it "should create a foreign key constraint"+suffix, :sqlite3 => :skip do
         change_table(@model, :bulk => bulk) do |t|
-          t.integer :user_id, foreign_key: true
+          t.references :user, foreign_key: true
         end
         expect(@model).to reference(:users, :id).on(:user_id)
       end
@@ -332,7 +338,7 @@ describe ActiveRecord::Migration do
           migration = Class.new ::ActiveRecord::Migration.latest_version do
             define_method(:change) {
               change_table("comments", :bulk => bulk) do |t|
-                t.integer :user_id, foreign_key: true
+                t.references :user, foreign_key: true
               end
             }
           end
@@ -346,7 +352,7 @@ describe ActiveRecord::Migration do
 
       it "should create a foreign key constraint using :references"+suffix, :sqlite3 => :skip do
         change_table(@model, :bulk => bulk) do |t|
-          t.references :user, foreign_key: true
+          t.send column_type, :user_id, foreign_key: true
         end
         expect(@model).to reference(:users, :id).on(:user_id)
       end
@@ -367,19 +373,19 @@ describe ActiveRecord::Migration do
     end
 
     it "should create foreign key" do
-      add_column(:post_id, :integer, foreign_key: true) do
+      add_column(:post_id, column_type, foreign_key: true) do
         expect(@model).to reference(:posts, :id).on(:post_id)
       end
     end
 
     it "should create foreign key to explicitly given table" do
-      add_column(:author_id, :integer, :foreign_key => { :references => :users }) do
+      add_column(:author_id, column_type, :foreign_key => { :references => :users }) do
         expect(@model).to reference(:users, :id).on(:author_id)
       end
     end
 
     it "should create foreign key to explicitly given table using shortcut" do
-      add_column(:author_id, :integer, :references => :users) do
+      add_column(:author_id, column_type, :references => :users) do
         expect(@model).to reference(:users, :id).on(:author_id)
       end
     end
@@ -391,14 +397,14 @@ describe ActiveRecord::Migration do
     end
 
     it "should create foreign key to the same table on parent_id" do
-      add_column(:parent_id, :integer, foreign_key: true) do
+      add_column(:parent_id, column_type, foreign_key: true) do
         expect(@model).to reference(@model.table_name, :id).on(:parent_id)
       end
     end
 
     it "should use default on_update action" do
       SchemaPlus::ForeignKeys.config.on_update = :cascade
-      add_column(:post_id, :integer, foreign_key: true) do
+      add_column(:post_id, column_type, foreign_key: true) do
         expect(@model).to reference.on(:post_id).on_update(:cascade)
       end
       SchemaPlus::ForeignKeys.config.on_update = nil
@@ -406,7 +412,7 @@ describe ActiveRecord::Migration do
 
     it "should use default on_delete action" do
       SchemaPlus::ForeignKeys.config.on_delete = :cascade
-      add_column(:post_id, :integer, foreign_key: true) do
+      add_column(:post_id, column_type, foreign_key: true) do
         expect(@model).to reference.on(:post_id).on_delete(:cascade)
       end
       SchemaPlus::ForeignKeys.config.on_delete = nil
@@ -415,14 +421,14 @@ describe ActiveRecord::Migration do
     it "should allow to overwrite default actions" do
       SchemaPlus::ForeignKeys.config.on_delete = :cascade
       SchemaPlus::ForeignKeys.config.on_update = :restrict
-      add_column(:post_id, :integer, :foreign_key => { :on_update => :nullify, :on_delete => :nullify}) do
+      add_column(:post_id, column_type, :foreign_key => { :on_update => :nullify, :on_delete => :nullify}) do
         expect(@model).to reference.on(:post_id).on_delete(:nullify).on_update(:nullify)
       end
       SchemaPlus::ForeignKeys.config.on_delete = nil
     end
 
     it "should create foreign key with default name" do
-      add_column(:post_id, :integer, foreign_key: true) do
+      add_column(:post_id, column_type, foreign_key: true) do
         expect(@model).to reference(:posts, :id).with_name("fk_#{@model.table_name}_post_id")
       end
     end
@@ -456,7 +462,7 @@ describe ActiveRecord::Migration do
 
         before(:each) do
           recreate_table @model do |t|
-            t.integer :user_id, foreign_key: true
+            t.references :user, foreign_key: true
           end
         end
 
@@ -465,22 +471,22 @@ describe ActiveRecord::Migration do
         end
 
         it "should drop foreign key if it is no longer valid" do
-          change_column :user_id, :integer, :foreign_key => { :references => :members }
+          change_column :user_id, column_type, :foreign_key => { :references => :members }
           expect(@model).not_to reference(:users)
         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, column_type, :foreign_key => { :references => nil }
           expect(@model).not_to reference(:users)
         end
 
         it "should reference pointed table afterwards if new one is created" do
-          change_column :user_id, :integer, :foreign_key => { :references => :members }
+          change_column :user_id, column_type, :foreign_key => { :references => :members }
           expect(@model).to reference(:members)
         end
 
         it "should maintain foreign key if it's unaffected by change" do
-          change_column :user_id, :integer, :default => 0
+          change_column :user_id, column_type, :default => 0
           expect(@model).to reference(:users)
         end
 
@@ -503,7 +509,7 @@ describe ActiveRecord::Migration do
     before(:each) do
       @model = Comment
       recreate_table @model do |t|
-        t.integer :post_id, foreign_key: true
+        t.references :post, foreign_key: true
       end
     end
 
@@ -529,7 +535,7 @@ describe ActiveRecord::Migration do
     before(:each) do
       @model = Comment
       recreate_table @model do |t|
-        t.integer :user_id, foreign_key: true
+        t.references :user, foreign_key: true
         t.integer :xyz, :index => true
       end
       ActiveRecord::Migration.suppress_messages do
@@ -549,8 +555,8 @@ describe ActiveRecord::Migration do
     before(:each) do
       @model = Comment
       recreate_table @model do |t|
-        t.integer :user_id
-        t.integer :member_id
+        t.references :user
+        t.references :member
       end
       ActiveRecord::Migration.suppress_messages do
         ActiveRecord::Migration.rename_table @model.table_name, :newname

data/spec/named_schemas_spec.rb

@@ -57,7 +57,7 @@ describe "with multiple schemas" do
 
     it "should not find foreign keys in other schema" do
       connection.create_table :comments, :force => true do |t|
-        t.integer :user_id, :foreign_key => false
+        t.references :user, :foreign_key => false
       end
       Comment.reset_column_information
       expect(Comment.foreign_keys.length).to eq(0)
@@ -67,7 +67,7 @@ describe "with multiple schemas" do
 
     it "should find foreign keys in this schema" do
       connection.create_table :comments, :force => true do |t|
-        t.integer :user_id, :foreign_key => true
+        t.references :user, :foreign_key => true
       end
       Comment.reset_column_information
       expect(Comment.foreign_keys.map(&:column).flatten).to eq(["user_id"])
@@ -85,8 +85,8 @@ describe "with multiple schemas" do
         create_table "schema_plus_test2.groups", :force => true do |t|
         end
         create_table "schema_plus_test2.members", :force => true do |t|
-          t.integer :item_id, :foreign_key => true unless SchemaDev::Rspec::Helpers.mysql?
-          t.integer :group_id, :foreign_key => { references: "schema_plus_test2.groups" }
+          t.references :item, :foreign_key => true unless SchemaDev::Rspec::Helpers.mysql?
+          t.references :group, :foreign_key => { references: "schema_plus_test2.groups" }
         end
       end
       class Group < ::ActiveRecord::Base

data/spec/schema_dumper_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'stringio'
 
 describe "Schema dump" do
+  let(:column_type) { Gem::Requirement.new('< 5.1').satisfied_by?(::ActiveRecord.version) ? :integer : :bigint }
 
   before(:each) do
     ActiveRecord::Migration.suppress_messages do
@@ -11,13 +12,13 @@ describe "Schema dump" do
         create_table :users, :force => true do |t|
           t.string :login
           t.datetime :deleted_at
-          t.integer :first_post_id, index: { unique: true }
+          t.references :first_post, index: { unique: true }
         end
 
         create_table :posts, :force => true do |t|
           t.text :body
-          t.integer :user_id
-          t.integer :first_comment_id
+          t.references :user
+          t.references :first_comment
           t.string :string_no_default
           t.integer :short_id
           t.string :str_short
@@ -34,8 +35,8 @@ describe "Schema dump" do
 
         create_table :comments, :force => true do |t|
           t.text :body
-          t.integer :post_id
-          t.integer :commenter_id
+          t.references :post
+          t.references :commenter
         end
       end
     end
@@ -53,7 +54,7 @@ describe "Schema dump" do
 
   it "should include foreign_key definition" do
     with_foreign_key Post, :user_id, :users, :id do
-      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*users})
+      expect(dump_posts).to match(%r{t.(integer|bigint)\s+"user_id".*foreign_key.*users})
     end
   end
 
@@ -65,7 +66,7 @@ describe "Schema dump" do
 
   it "should respect foreign key's primary key" do
     with_foreign_key Post, :user_id, :users, :first_post_id do
-      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*:primary_key=>"first_post_id"})
+      expect(dump_posts).to match(%r{t.(integer|bigint)\s+"user_id".*foreign_key.*:primary_key=>"first_post_id"})
     end
   end
 
@@ -107,7 +108,7 @@ describe "Schema dump" do
 
   it "should include foreign_key options" do
     with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :nullify do
-      expect(dump_posts).to match(%q[t.integer\s*"user_id",.*:foreign_key=>{:references=>"users", :name=>"fk_posts_user_id", :on_update=>:cascade, :on_delete=>:nullify}])
+      expect(dump_posts).to match(%q[t.(integer|bigint)\s*"user_id",.*:foreign_key=>{:references=>"users", :name=>"fk_posts_user_id", :on_update=>:cascade, :on_delete=>:nullify}])
     end
   end
 
@@ -146,30 +147,30 @@ describe "Schema dump" do
             connection.tables_only.each do |table| drop_table table, force: :cascade end
 
             create_table :grade_systems, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
-              t.integer  :parent_id
-              t.integer  :profile_id
+              t.string     :name
+              t.references :school
+              t.references :parent
+              t.references :profile
             end
 
             create_table :schools, force: true do |t|
-              t.string   :name
-              t.integer  :default_grade_system_id
+              t.string     :name
+              t.references :default_grade_system
             end
 
             create_table :academic_years, force: true do |t|
-              t.string  :name
-              t.integer :school_id
+              t.string     :name
+              t.references :school
             end
 
             create_table :buildings, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
+              t.string     :name
+              t.references :school
             end
 
             create_table :profiles, force: true do |t|
-              t.integer  :school_id
-              t.integer  :building_id
+              t.references :school
+              t.references :building
             end
 
           end
@@ -217,7 +218,7 @@ describe "Schema dump" do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
         table_columns.each do |column|
-          t.column column.name, column.type
+          t.column column.name, column.type, limit: column.limit
         end
         columnsets.each do |columns, referenced_table_name, referenced_columns, options|
           t.foreign_key columns, referenced_table_name, (options||{}).merge(primary_key: referenced_columns)
@@ -231,7 +232,7 @@ describe "Schema dump" do
       ActiveRecord::Migration.suppress_messages do
         ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
           table_columns.each do |column|
-            t.column column.name, column.type
+            t.column column.name, column.type, limit: column.limit
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,14 @@ files:
 - 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
 - lib/schema_plus/foreign_keys.rb
 - lib/schema_plus/foreign_keys/active_record/base.rb
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract/schema_creation.rb
@@ -249,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Extended support for foreign key constraints in ActiveRecord