schema_auto_foreign_keys 0.1.2 → 1.1.0

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 do
+          migration = Class.new ::ActiveRecord::Migration::Current 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 unless SimpleCov.running
 
 $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)