foreigner 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d171f299599a3b127e112d8e3d5fbcf9203fa02e
-  data.tar.gz: 300f57bff53bf3445f3dce4c759c86104374d006
+  metadata.gz: d68267917004a48382056d76a3a0057f170089d0
+  data.tar.gz: fa071b2e0de7ff5aa27f50598a2633c12e75d744
 SHA512:
-  metadata.gz: f376ca1b7f10fb7db1bcd75e27b251d136005056deff08136bd1b6dd31e0a747d4f6ccf3689052f5cb0d4739f3c64b925637c3f6d17f59f1976292e924489d49
-  data.tar.gz: b97a052321dfe604598ac867cbdab9cdced3e83c5acd264fee9649178d6e934fb1e52dec979497f9aa0f80c92515abaec7cc449e620c51b5f2c717fff3dac8a7
+  metadata.gz: 1ff99f300a776fbc3868614a116c375f63ce89e2cf4735890a9a01dd70085a3b9815118ac6a64005f3a1561ca9772e828441e49b7c9854b936dedd99bd8a10ac
+  data.tar.gz: ae4c8dbc8af8d9ab0b67b5bfa6b3592acb58229a1d27b4a420233e57dce7c5de6f33e5ba725ba79af9fbb5f626fef080c53e0eb72cd7bfc01010a8ed966dc497

data/{README.rdoc → README.md}

@@ -1,7 +1,7 @@
-= Foreigner
-{<img src="https://secure.travis-ci.org/matthuhiggins/foreigner.png?rvm=1.9.3" />}[http://travis-ci.org/matthuhiggins/foreigner]
+# Foreigner
+[![Build Status](https://travis-ci.org/matthuhiggins/foreigner.png)](https://travis-ci.org/matthuhiggins/foreigner) [![Code Climate](https://codeclimate.com/github/matthuhiggins/foreigner.png)](https://codeclimate.com/github/matthuhiggins/foreigner)
 
-Foreigner introduces a few methods to your migrations for adding and removing foreign key constraints. It also dumps foreign keys to schema.rb.
+Foreigner introduces a few methods to your migrations for adding and removing foreign key constraints. It also dumps foreign keys to `schema.rb`.
 
 The following adapters are supported:
 
@@ -9,82 +9,86 @@ The following adapters are supported:
 * postgres
 * sqlite (foreign key methods are a no-op)
 
-== Installation
+## Installation
 
 Add the following to your Gemfile:
-
+```ruby
   gem 'foreigner'
-
-== API Examples
+```
+## API Examples
 
 Foreigner adds two methods to migrations.
 
-* add_foreign_key(from_table, to_table, options)
-* remove_foreign_key(from_table, options)
+* `add_foreign_key(from_table, to_table, options)`
+* `remove_foreign_key(from_table, options)`
 
-(Options are documented in connection_adapters/abstract/schema_definitions.rb):
+(Options are documented in `connection_adapters/abstract/schema_definitions.rb`):
 
 For example, given the following model:
-
+```ruby
   class Comment < ActiveRecord::Base
     belongs_to :post
   end
-  
+
   class Post < ActiveRecord::Base
     has_many :comments, dependent: :delete_all
   end
-  
+```  
 You should add a foreign key in your migration:
-
+```ruby
   add_foreign_key(:comments, :posts)
-
-The :dependent option can be moved from the has_many definition to the foreign key:
-
+```
+The `:dependent` option can be moved from the `has_many` definition to the foreign key:
+```ruby
   add_foreign_key(:comments, :posts, dependent: :delete)
-
-If the column is named article_id instead of post_id, use the :column option:
-
+```
+If the column is named `article_id` instead of `post_id`, use the `:column` option:
+```ruby
   add_foreign_key(:comments, :posts, column: 'article_id')
-  
+```
 A name can be specified for the foreign key constraint:
-
+```ruby
   add_foreign_key(:comments, :posts, name: 'comment_article_foreign_key')
+```
+The `:column` and `:name` options create a foreign key with a custom name. In order to remove it you need to specify `:name`:
+```ruby
+  remove_foreign_key(:comments, name: 'comment_article_foreign_key')
+```
+## Change Table Methods
 
-== Change Table Methods
-
-Foreigner adds extra methods to create_table and change_table.
+Foreigner adds extra methods to `create_table` and `change_table`.
 
 Create a new table with a foreign key:
-  
+```ruby
   create_table :products do |t|
     t.string :name
     t.integer :factory_id
     t.foreign_key :factories
   end
-
+```
 Add a missing foreign key to comments:
-
+```ruby
   change_table :comments do |t|
     t.foreign_key :posts, dependent: :delete
   end
-
+```
 Remove an unwanted foreign key:
-  
+```ruby
   change_table :comments do |t|
     t.remove_foreign_key :users
   end
+```
+## Database-specific options
 
-== Database specific options
-
-Database specific options will never be supported by foreigner. You can add them using :options:
-
+Database-specific options will never be supported by foreigner. You can add them using `:options`:
+```ruby
   add_foreign_key(:comments, :posts, options: 'ON UPDATE DEFERRED')
+```
+## Foreigner Add-ons
 
-== Foreigner Add-ons
-
-* {immigrant}[https://github.com/jenseng/immigrant] - generate a migration that includes all missing foreign keys.
-* {sqlserver-foreigner}[https://github.com/cleblanc87/sqlserver-foreigner] - A plugin for SQL Server.
+* [immigrant](https://github.com/jenseng/immigrant) - generate a migration that includes all missing foreign keys.
+* [sqlserver-foreigner](https://github.com/cleblanc87/sqlserver-foreigner) - A plugin for SQL Server.
 
-== License
+## License
 
 Copyright (c) 2012 Matthew Higgins, released under the MIT license

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake'
 # end
 
 desc 'Default: run unit tests.'
-task :default => :test
+task default: :test
 
 require 'rake/testtask'
 desc 'Test the foreigner plugin.'

data/lib/foreigner.rb

@@ -1,4 +1,5 @@
 require 'active_support/all'
+require 'active_record'
 
 module Foreigner
   extend ActiveSupport::Autoload

data/lib/foreigner/connection_adapters/abstract/foreign_key_definition.rb

@@ -1,6 +1,9 @@
 module Foreigner
   module ConnectionAdapters
     class ForeignKeyDefinition < Struct.new(:from_table, :to_table, :options) #:nodoc:
+      def name
+        options[:name]
+      end
     end
   end
 end

data/lib/foreigner/connection_adapters/abstract/schema_statements.rb

@@ -7,7 +7,7 @@ module Foreigner
         end
       end
     end
-    
+
     module AbstractAdapter
       def create_table(table_name, *args, &block)
         definition = nil
@@ -26,6 +26,20 @@ module Foreigner
         false
       end
 
+      # Checks to see if a foreign key exists on a table for a given constraint.
+      #
+      #   # Check a foreign key exists
+      #   foreign_key_exists?(:suppliers, :companies)
+      #
+      #   # Check a foreign key with a custom name exists
+      #   foreign_key_exists?(:suppliers, name: "fk_company_id"
+      #
+      #   # Check a foreign key on a column
+      #   foreign_key_exists?(:suppliers, column: "company_id"
+      #
+      def foreign_key_exists?(table_name, column_name, options = {})
+      end
+
       # Adds a new foreign key to the +from_table+, referencing the primary key of +to_table+
       #
       # The foreign key will be named after the from and to tables unless you pass
@@ -37,20 +51,20 @@ module Foreigner
       # generates
       #  ALTER TABLE `comments` ADD CONSTRAINT
       #     `comments_post_id_fk` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
-      # 
+      #
       # ====== Creating a named foreign key
       #  add_foreign_key(:comments, :posts, name: 'comments_belongs_to_posts')
       # generates
       #  ALTER TABLE `comments` ADD CONSTRAINT
       #     `comments_belongs_to_posts` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
-      # 
+      #
       # ====== Creating a cascading foreign_key on a custom column
       #  add_foreign_key(:people, :people, column: 'best_friend_id', dependent: :nullify)
       # generates
       #  ALTER TABLE `people` ADD CONSTRAINT
       #     `people_best_friend_id_fk` FOREIGN KEY (`best_friend_id`) REFERENCES `people` (`id`)
       #     ON DELETE SET NULL
-      # 
+      #
       # === Supported options
       # [:column]
       #   Specify the column name on the from_table that references the to_table. By default this is guessed

data/lib/foreigner/connection_adapters/mysql2_adapter.rb

@@ -4,15 +4,11 @@ module Foreigner
       include Foreigner::ConnectionAdapters::Sql2003
 
       def remove_foreign_key_sql(table, options)
-        if Hash === options
-          foreign_key_name = foreign_key_name(table, options[:column], options)
-        else
-          foreign_key_name = foreign_key_name(table, "#{options.to_s.singularize}_id")
-        end
+        foreign_key_name = decipher_foreign_key_name(table, options)
 
         "DROP FOREIGN KEY #{quote_column_name(foreign_key_name)}"
       end
-      
+
       def foreign_keys(table_name)
         fk_info = select_all %{
           SELECT fk.referenced_table_name as 'to_table'
@@ -28,7 +24,7 @@ module Foreigner
         create_table_info = select_one("SHOW CREATE TABLE #{quote_table_name(table_name)}")["Create Table"]
 
         fk_info.map do |row|
-          options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
+          options = {column: row['column'], name: row['name'], primary_key: row['primary_key']}
 
           if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .* ON DELETE (CASCADE|SET NULL|RESTRICT)/
             options[:dependent] = case $1

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -17,9 +17,9 @@ module Foreigner
             AND t3.nspname = ANY (current_schemas(false))
           ORDER BY c.conname
         }
-        
+
         fk_info.map do |row|
-          options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
+          options = {column: row['column'], name: row['name'], primary_key: row['primary_key']}
 
           options[:dependent] = case row['dependency']
             when 'c' then :delete

data/lib/foreigner/connection_adapters/sql2003.rb

@@ -14,6 +14,12 @@ module Foreigner
         end
       end
 
+      def foreign_key_exists?(from_table, options)
+        foreign_key_name = decipher_foreign_key_name(from_table, options)
+
+        foreign_keys(from_table).any? { |fk| fk.name == foreign_key_name }
+      end
+
       def add_foreign_key(from_table, to_table, options = {})
         sql = "ALTER TABLE #{quote_table_name(from_table)} #{add_foreign_key_sql(from_table, to_table, options)}"
         execute(sql)
@@ -21,7 +27,7 @@ module Foreigner
 
       def add_foreign_key_sql(from_table, to_table, options = {})
         column  = options[:column] || "#{to_table.to_s.singularize}_id"
-        foreign_key_name = foreign_key_name(from_table, column, options)
+        foreign_key_name = options.key?(:name) ? options[:name].to_s : foreign_key_name(from_table, column)
         primary_key = options[:primary_key] || "id"
         dependency = dependency_sql(options[:dependent])
 
@@ -40,21 +46,24 @@ module Foreigner
       end
 
       def remove_foreign_key_sql(table, options)
-        if Hash === options
-          foreign_key_name = foreign_key_name(table, options[:column], options)
-        else
-          foreign_key_name = foreign_key_name(table, "#{options.to_s.singularize}_id")
-        end
-
+        foreign_key_name = decipher_foreign_key_name(table, options)
         "DROP CONSTRAINT #{quote_column_name(foreign_key_name)}"
       end
 
       private
-        def foreign_key_name(table, column, options = {})
-          if options[:name]
-            options[:name]
+        def foreign_key_name(from_table, column)
+          "#{from_table}_#{column}_fk"
+        end
+
+        def foreign_key_column(to_table)
+          "#{to_table.to_s.singularize}_id"
+        end
+
+        def decipher_foreign_key_name(from_table, options)
+          if Hash === options
+            options.key?(:name) ? options[:name].to_s : foreign_key_name(from_table, options[:column])
           else
-            "#{table}_#{column}_fk"
+            foreign_key_name(from_table, foreign_key_column(options))
           end
         end
 

data/lib/foreigner/migration/command_recorder.rb

@@ -14,9 +14,9 @@ module Foreigner
         add_options ||= {}
 
         if add_options[:name]
-          options = {:name => add_options[:name]}
+          options = {name: add_options[:name]}
         elsif add_options[:column]
-          options = {:column => add_options[:column]}
+          options = {column: add_options[:column]}
         else
           options = to_table
         end

data/lib/foreigner/schema_dumper.rb

@@ -10,16 +10,16 @@ module Foreigner
       def dump_foreign_key(foreign_key)
         statement_parts = [ ('add_foreign_key ' + remove_prefix_and_suffix(foreign_key.from_table).inspect) ]
         statement_parts << remove_prefix_and_suffix(foreign_key.to_table).inspect
-        statement_parts << (':name => ' + foreign_key.options[:name].inspect)
+        statement_parts << ('name: ' + foreign_key.options[:name].inspect)
 
         if foreign_key.options[:column] != "#{remove_prefix_and_suffix(foreign_key.to_table).singularize}_id"
-          statement_parts << (':column => ' + foreign_key.options[:column].inspect)
+          statement_parts << ('column: ' + foreign_key.options[:column].inspect)
         end
         if foreign_key.options[:primary_key] != 'id'
-          statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
+          statement_parts << ('primary_key: ' + foreign_key.options[:primary_key].inspect)
         end
         if foreign_key.options[:dependent].present?
-          statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
+          statement_parts << ('dependent: ' + foreign_key.options[:dependent].inspect)
         end
 
         statement_parts.join(', ')

data/test/foreigner/connection_adapters/mysql2_adapter_test.rb

@@ -17,18 +17,18 @@ class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
       @adapter.remove_foreign_key_sql(:suppliers, :companies)
     )
   end
-  
+
   test 'remove_foreign_key_sql by name' do
     assert_equal(
       "DROP FOREIGN KEY `belongs_to_supplier`",
-      @adapter.remove_foreign_key_sql(:suppliers, :name => "belongs_to_supplier")
+      @adapter.remove_foreign_key_sql(:suppliers, name: "belongs_to_supplier")
     )
   end
-  
+
   test 'remove_foreign_key_sql by column' do
     assert_equal(
       "DROP FOREIGN KEY `suppliers_ship_to_id_fk`",
-      @adapter.remove_foreign_key_sql(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key_sql(:suppliers, column: "ship_to_id")
     )
   end
 end

data/test/foreigner/connection_adapters/sql2003_test.rb

@@ -20,55 +20,67 @@ class Foreigner::Sql2003Test < Foreigner::UnitTest
     assert @adapter.instance_variable_get(:@disable_referential_integrity)
   end
 
+  test 'foreign_key_exists' do
+    @adapter.expects(:foreign_keys).with(:mommas).at_least_once.returns [Foreigner::ConnectionAdapters::ForeignKeyDefinition.new(:mommas, :babies, name: 'mommas_baby_id_fk')]
+
+    assert @adapter.foreign_key_exists?(:mommas, :babies)
+    assert @adapter.foreign_key_exists?(:mommas, name: 'mommas_baby_id_fk')
+    assert @adapter.foreign_key_exists?(:mommas, column: 'baby_id')
+
+    refute @adapter.foreign_key_exists?(:mommas, name: 'mommas_foo_id')
+    refute @adapter.foreign_key_exists?(:mommas, column: 'son_id')
+    refute @adapter.foreign_key_exists?(:mommas, :houses)
+  end
+
   test 'add_without_options' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id)",
       @adapter.add_foreign_key(:employees, :companies)
     )
   end
-  
+
   test 'add_with_name' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `favorite_company_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :name => 'favorite_company_fk')
+      @adapter.add_foreign_key(:employees, :companies, name: 'favorite_company_fk')
     )
   end
-  
+
   test 'add_with_column' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_last_employer_id_fk` FOREIGN KEY (`last_employer_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :column => 'last_employer_id')
-    ) 
+      @adapter.add_foreign_key(:employees, :companies, column: 'last_employer_id')
+    )
   end
-  
+
   test 'add_with_column_and_name' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `favorite_company_fk` FOREIGN KEY (`last_employer_id`) REFERENCES `companies`(id)",
-      @adapter.add_foreign_key(:employees, :companies, :column => 'last_employer_id', :name => 'favorite_company_fk')
+      @adapter.add_foreign_key(:employees, :companies, column: 'last_employer_id', name: 'favorite_company_fk')
     )
   end
-  
+
   test 'add_with_delete_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE CASCADE",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :delete)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :delete)
     )
   end
-  
+
   test 'add_with_nullify_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE SET NULL",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :nullify)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :nullify)
     )
   end
-  
+
   test 'add_with_restrict_dependency' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "ON DELETE RESTRICT",
-      @adapter.add_foreign_key(:employees, :companies, :dependent => :restrict)
+      @adapter.add_foreign_key(:employees, :companies, dependent: :restrict)
     )
   end
 
@@ -76,28 +88,28 @@ class Foreigner::Sql2003Test < Foreigner::UnitTest
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
       "on delete foo",
-      @adapter.add_foreign_key(:employees, :companies, :options => 'on delete foo')
+      @adapter.add_foreign_key(:employees, :companies, options: 'on delete foo')
     )
   end
-  
+
   test 'remove_by_table' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `suppliers_company_id_fk`",
       @adapter.remove_foreign_key(:suppliers, :companies)
     )
   end
-  
+
   test 'remove_by_name' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `belongs_to_supplier`",
-      @adapter.remove_foreign_key(:suppliers, :name => "belongs_to_supplier")
+      @adapter.remove_foreign_key(:suppliers, name: "belongs_to_supplier")
     )
   end
-  
+
   test 'remove_by_column' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `suppliers_ship_to_id_fk`",
-      @adapter.remove_foreign_key(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key(:suppliers, column: "ship_to_id")
     )
   end
 end

data/test/foreigner/migration/command_recorder_test.rb

@@ -5,36 +5,47 @@ ActiveRecord::Migration::CommandRecorder.class_eval do
 end
 
 class Foreigner::CommandRecorderTest < Foreigner::UnitTest
-  def setup
+  setup do
     @recorder = ActiveRecord::Migration::CommandRecorder.new
   end
 
   test 'invert_add_foreign_key' do
-    @recorder.add_foreign_key(:employees, :companies)
-    remove = @recorder.inverse.first
-    assert_equal [:remove_foreign_key, [:employees, :companies]], remove
+    @recorder.revert do
+      @recorder.add_foreign_key(:employees, :companies)
+    end
+
+    assert_equal [
+      [:remove_foreign_key, [:employees, :companies]]
+    ], @recorder.commands
   end
 
   test 'invert_add_foreign_key with column' do
-    @recorder.add_foreign_key(:employees, :companies, :column => :place_id)
-    remove = @recorder.inverse.first
-    assert_equal [:remove_foreign_key, [:employees, {:column => :place_id}]], remove
+    @recorder.revert do
+      @recorder.add_foreign_key(:employees, :companies, column: :place_id)
+    end
+
+    assert_equal [
+      [:remove_foreign_key, [:employees, {column: :place_id}]]
+    ], @recorder.commands
   end
 
   test 'invert_add_foreign_key with name' do
-    @recorder.add_foreign_key(:employees, :companies, :name => 'the_best_fk', :column => :place_id)
-    remove = @recorder.inverse.first
-    assert_equal [:remove_foreign_key, [:employees, {:name => 'the_best_fk'}]], remove
-    
-    @recorder.record :rename_table, [:old, :new]
-    rename = @recorder.inverse.first
-    assert_equal [:rename_table, [:new, :old]], rename
+    @recorder.revert do
+      @recorder.add_foreign_key(:employees, :companies, name: 'the_best_fk', column: :place_id)
+    end
+
+    assert_equal [
+      [:remove_foreign_key, [:employees, {name: 'the_best_fk'}]]
+    ], @recorder.commands
   end
 
   test 'remove_foreign_key is irreversible' do
-    @recorder.remove_foreign_key(:employees, :companies)
     assert_raise ActiveRecord::IrreversibleMigration do
-      @recorder.inverse
+      @recorder.revert do
+        @recorder.remove_foreign_key(:employees, :companies)
+      end
     end
+      # @recorder.inverse
+    # end
   end
 end

data/test/foreigner/schema_dumper_test.rb

@@ -28,10 +28,10 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
   end
 
   test 'dump_foreign_key' do
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz')
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :primary_key => \"uuid\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'uuid', name: 'lulz')
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :dependent => :delete", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz', dependent: :delete)
-    assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\", :column => \"mamma_id\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'mamma_id', primary_key: 'id', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", primary_key: \"uuid\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'uuid', name: 'lulz')
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", dependent: :delete", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'bar_id', primary_key: 'id', name: 'lulz', dependent: :delete)
+    assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\", column: \"mamma_id\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('foos', 'bars', column: 'mamma_id', primary_key: 'id', name: 'lulz')
   end
 
   test 'all tables' do
@@ -52,7 +52,7 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
     begin
       ActiveRecord::Base.table_name_prefix = 'pre_'
       ActiveRecord::Base.table_name_suffix = '_suf'
-      assert_dump "add_foreign_key \"foos\", \"bars\", :name => \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('pre_foos_suf', 'pre_bars_suf', column: 'bar_id', primary_key: 'id', name: 'lulz')
+      assert_dump "add_foreign_key \"foos\", \"bars\", name: \"lulz\"", Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('pre_foos_suf', 'pre_bars_suf', column: 'bar_id', primary_key: 'id', name: 'lulz')
     ensure
       ActiveRecord::Base.table_name_suffix = ActiveRecord::Base.table_name_prefix = ''
     end

data/test/helper.rb

@@ -1,9 +1,9 @@
 require 'bundler/setup'
-Bundler.require(:default)
+Bundler.require :default, :test
 
-require 'test/unit'
-require 'active_record'
-require 'mocha'
+require 'active_support/test_case'
+require 'minitest/autorun'
+require 'mocha/setup'
 
 # Foreigner::Adapter.registered.values.each do |file_name|
 #   require file_name
@@ -14,7 +14,7 @@ module TestAdapterMethods
     sql_statements << sql
     sql
   end
-  
+
   def quote_table_name(name)
     quote_column_name(name).gsub('.', '`.`')
   end
@@ -27,7 +27,7 @@ module TestAdapterMethods
     @sql_statements ||= []
   end
 
-  def drop_table(name, options = {})  
+  def drop_table(name, options = {})
   end
 
   def disable_referential_integrity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,12 +42,11 @@ description: Adds helpers to migrations and dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
+- README.md
 - lib/foreigner/adapter.rb
 - lib/foreigner/connection_adapters/abstract/foreign_key_definition.rb
 - lib/foreigner/connection_adapters/abstract/schema_definitions.rb
@@ -85,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='