schema_plus_foreign_keys 0.1.7 → 1.0.1.beta.1

data/spec/deprecation_spec.rb

@@ -1,95 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Deprecations' do
 
   let(:migration) { ActiveRecord::Migration }
 
-  describe "on add_foreign_key", sqlite3: :skip do
-    before(:each) do
-      define_schema do
-        create_table :posts
-        create_table :comments do |t|
-          t.integer :post_id
-        end
-      end
-      class Comment < ::ActiveRecord::Base ; end
-    end
-
-    it "deprecates 4-argument form" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/4-argument/)
-      migration.add_foreign_key "comments", "post_id", "posts", "id"
-      expect(Comment).to reference(:posts, :id).on(:post_id)
-    end
-
-  end
-
-  describe "on remove_foreign_key", sqlite3: :skip do
-    before(:each) do
-      define_schema do
-        create_table :posts
-        create_table :comments do |t|
-          t.integer :post_id, foreign_key: true
-        end
-      end
-      class Comment < ::ActiveRecord::Base ; end
-    end
-
-    it "deprecates :column_names option" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/column_names/)
-      migration.remove_foreign_key "comments", "posts", column_names: "post_id"
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "deprecates :references_column_names option" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/references_column_names.*primary_key/)
-      migration.remove_foreign_key "comments", "posts", references_column_names: "id"
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "deprecates :references_table_name option" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/references_table_name.*to_table/)
-      migration.remove_foreign_key "comments", references_table_name: "posts"
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "deprecates table-and-name form" do
-      Comment.reset_column_information
-      name = Comment.foreign_keys.first.name
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/name.*name: name/)
-      migration.remove_foreign_key "comments", name
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "deprecates 3-argument form" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/3.*-argument/)
-      migration.remove_foreign_key "comments", "post_id", "posts"
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "deprecates 4-argument form" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/4.*-argument/)
-      migration.remove_foreign_key "comments", "post_id", "posts", "id"
-      Comment.reset_column_information
-      expect(Comment).to_not reference(:posts, :id).on(:post_id)
-    end
-
-    it "raises error for 5 arguments" do
-      expect { migration.remove_foreign_key "zip", "a", "dee", "do", "da" }.to raise_error /Wrong number of arguments.*5/
-    end
-
-  end
-
   describe "on foreign key definition" do
     before(:each) 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
@@ -100,33 +22,13 @@ describe 'Deprecations' do
       Comment.foreign_keys.first
     }
 
-    it "deprecates column_names" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/column_names/)
-      expect(definition.column_names).to eq(["post_id"])
-    end
-
-    it "deprecates references_column_names" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/references_column_names.*primary_key/)
-      expect(definition.references_column_names).to eq(["id"])
-    end
-
-    it "deprecates references_table_name" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/references_table_name.*to_table/)
-      expect(definition.references_table_name).to eq("posts")
-    end
-
-    it "deprecates table_name" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/table_name.*from_table/)
-      expect(definition.table_name).to eq("comments")
-    end
-
     it "deprecates :set_null" do
       expect(ActiveSupport::Deprecation).to receive(:warn).with(/set_null.*nullify/)
       allow(ActiveSupport::Deprecation).to receive(:warn).with(/table_exists\? currently checks/)
       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)
@@ -135,17 +37,16 @@ describe 'Deprecations' do
   end
 
   describe "in table definition" do
-    it "deprecates 3-column form" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).with(/positional arg.*primary_key/)
-      allow(ActiveSupport::Deprecation).to receive(:warn).with(/table_exists\? currently checks/)
-      define_schema do
-        create_table :posts, primary_key: :funky
-        create_table :comments do |t|
-          t.integer :post_id
-          t.foreign_key :post_id, :posts, :funky
+    it "raises error for 3 arguments" do
+      expect {
+        define_schema do
+          create_table :posts, primary_key: :funky
+          create_table :comments do |t|
+            t.references :post
+            t.foreign_key :post_id, :posts, :funky
+          end
         end
-      end
-      expect(migration.foreign_keys("comments").first.primary_key).to eq("funky")
+      }.to raise_error /wrong number of arguments/i
     end
 
     it "raises error for 4 arguments" do
@@ -153,7 +54,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_definition_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Foreign Key definition" do
 
   let(:definition) {
-    options = {:name => "posts_user_fkey", :column => :user, :primary_key => :id}
+    options = {name: "posts_user_fkey", column: :user, primary_key: :id}
     ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
   }
 
@@ -12,13 +14,13 @@ describe "Foreign Key definition" do
   end
 
   it "dumps to sql with deferrable values" do
-    options = {:name => "posts_user_fkey", :column => :user, :primary_key => :id, :deferrable => true}
+    options = {name: "posts_user_fkey", column: :user, primary_key: :id, deferrable: true}
     deferred_definition = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
     expect(deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE})
   end
 
   it "dumps to sql with initially deferrable values" do
-    options = {:name => "posts_user_fkey", :column => :user, :primary_key => :id, :deferrable => :initially_deferred}
+    options = {name: "posts_user_fkey", column: :user, primary_key: :id, deferrable: :initially_deferred}
     initially_deferred_definition = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(:posts, :users, options)
     expect(initially_deferred_definition.to_sql).to eq(%Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')}) DEFERRABLE INITIALLY DEFERRED})
   end

data/spec/foreign_key_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Foreign Key" do
@@ -7,12 +9,12 @@ describe "Foreign Key" do
   context "created with table" do
     before(:each) do
       define_schema do
-        create_table :users, :force => true do |t|
+        create_table :users, force: true do |t|
           t.string :login
         end
-        create_table :comments, :force => true do |t|
-          t.integer :user_id
-          t.foreign_key :user_id, :users
+        create_table :comments, force: true do |t|
+          t.references :user
+          t.foreign_key :users, column: :user_id
         end
       end
       class User < ::ActiveRecord::Base ; end
@@ -34,21 +36,21 @@ describe "Foreign Key" do
 
     before(:each) do
       define_schema do
-        create_table :users, :force => true do |t|
+        create_table :users, force: true do |t|
           t.string :login
           t.datetime :deleted_at
         end
 
-        create_table :posts, :force => true do |t|
+        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|
+        create_table :comments, force: true do |t|
           t.text :body
-          t.integer :post_id
-          t.foreign_key :post_id, :posts
+          t.references :post
+          t.foreign_key :posts, column: :post_id
         end
       end
       class User < ::ActiveRecord::Base ; end
@@ -58,12 +60,12 @@ describe "Foreign Key" do
     end
 
 
-    context "works", :sqlite3 => :skip do
+    context "works", sqlite3: :skip do
 
       context "when is added", "posts(author_id)" do
 
         before(:each) do
-          add_foreign_key(:posts, :users, :column => :author_id, :on_update => :cascade, :on_delete => :restrict)
+          add_foreign_key(:posts, :users, column: :author_id, on_update: :cascade, on_delete: :restrict)
         end
 
         it "references users(id)" do
@@ -90,7 +92,7 @@ describe "Foreign Key" do
 
       context "when is dropped", "comments(post_id)" do
 
-        let(:foreign_key_name) { fk = Comment.foreign_keys.detect(&its.column == 'post_id') and fk.name }
+        let(:foreign_key_name) { fk = Comment.foreign_keys.detect { |it| it.column == 'post_id' } and fk.name }
 
         before(:each) do
           remove_foreign_key(:comments, name: foreign_key_name)
@@ -112,7 +114,7 @@ describe "Foreign Key" do
 
       context "when drop using hash", "comments(post_id)" do
 
-        let(:foreign_key_name) { fk = Comment.foreign_keys.detect(&its.column == 'post_id') and fk.name }
+        let(:foreign_key_name) { fk = Comment.foreign_keys.detect { |it| it.column == 'post_id' } and fk.name }
 
         it "finds by name" do
           remove_foreign_key(:comments, name: foreign_key_name)
@@ -131,7 +133,7 @@ describe "Foreign Key" do
         end
 
         it "does not error with :if_exists" do
-          expect{remove_foreign_key(:comments, "posts", column: "nonesuch", :if_exists => true)}.to_not raise_error
+          expect{remove_foreign_key(:comments, "posts", column: "nonesuch", if_exists: true)}.to_not raise_error
         end
       end
 
@@ -149,8 +151,8 @@ describe "Foreign Key" do
       context "when table name is a reserved word" do
         before(:each) do
           migration.suppress_messages do
-            migration.create_table :references, :force => true do |t|
-              t.integer :post_id, :foreign_key => false
+            migration.create_table :references, force: true do |t|
+              t.references :post, foreign_key: false
             end
           end
         end
@@ -168,11 +170,11 @@ describe "Foreign Key" do
 
     end
 
-    context "raises an exception", :sqlite3 => :only do
+    context "raises an exception", sqlite3: :only do
 
       it "when attempting to add" do
         expect {
-          add_foreign_key(:posts, :users, :column => :author_id, :on_update => :cascade, :on_delete => :restrict)
+          add_foreign_key(:posts, :users, column: :author_id, on_update: :cascade, on_delete: :restrict)
         }.to raise_error(NotImplementedError)
       end
 
@@ -186,18 +188,18 @@ describe "Foreign Key" do
   end
 
   protected
-  def add_foreign_key(*args)
+  def add_foreign_key(*args, **kwargs)
     migration.suppress_messages do
-      migration.add_foreign_key(*args)
+      migration.add_foreign_key(*args, **kwargs)
     end
     User.reset_column_information
     Post.reset_column_information
     Comment.reset_column_information
   end
 
-  def remove_foreign_key(*args)
+  def remove_foreign_key(*args, **kwargs)
     migration.suppress_messages do
-      migration.remove_foreign_key(*args)
+      migration.remove_foreign_key(*args, **kwargs)
     end
     User.reset_column_information
     Post.reset_column_information