foreigner 1.0.2 → 1.0.3

data/lib/foreigner/connection_adapters/sql2003.rb

@@ -26,7 +26,7 @@ module Foreigner
         sql
       end
 
-      def remove_foreign_key(table, to_table = nil, options = {})
+      def remove_foreign_key(table, options = {})
         execute "ALTER TABLE #{quote_table_name(table)} #{remove_foreign_key_sql(table, options)}"
       end
 

data/lib/foreigner/migration/command_recorder.rb

@@ -9,13 +9,22 @@ module Foreigner
         record(:remove_foreign_key, args)
       end
 
-      def invert_add_foreign_key(*args)
-        [:remove_foreign_key, *args]
-      end
-      
-      def invert_remove_foreign_key(*args)
-        [:add_foreign_key, *args]
+      def invert_add_foreign_key(args)#from_table, to_table, add_options = {})
+        from_table, to_table, add_options = *args
+        add_options ||= {}
+
+        if add_options[:name]
+          options = {:name => add_options[:name]}
+        elsif add_options[:column]
+          options = {:column => add_options[:column]}
+        else
+          options = to_table
+        end
+
+        [:remove_foreign_key, [from_table, options]]
       end
     end
   end
-end
+end
+      
+

data/test/helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'rails/all'
 
-require 'foreigner'
+require File.expand_path('../../lib/foreigner', __FILE__)
 
 Foreigner::Adapter.registered.values.each do |file_name|
   require file_name

data/test/unit/command_recorder_test.rb

@@ -0,0 +1,40 @@
+require 'helper'
+
+ActiveRecord::Migration::CommandRecorder.class_eval do
+  include ::Foreigner::Migration::CommandRecorder
+end
+
+class Foreigner::CommandRecorderTest < Foreigner::UnitTest
+  def setup
+    @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
+  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
+  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
+  end
+
+  test 'remove_foreign_key is irreversible' do
+    @recorder.remove_foreign_key(:employees, :companies)
+    assert_raise ActiveRecord::IrreversibleMigration do
+      @recorder.inverse
+    end
+  end
+end

data/test/{mysql2_adapter_test.rb → unit/mysql2_adapter_test.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Mysql2AdapterTest < Foreigner::AdapterTest
+class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
   include Foreigner::ConnectionAdapters::Mysql2Adapter
 
   test 'remove_by_table' do

data/test/{sql2003_test.rb → unit/sql2003_test.rb}

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Sql2003Test < Foreigner::AdapterTest
+class Foreigner::Sql2003Test < Foreigner::UnitTest
   include Foreigner::ConnectionAdapters::Sql2003
 
   test 'add_without_options' do

metadata

@@ -2,7 +2,7 @@
 name: foreigner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -07:00
+date: 2011-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,9 @@ files:
 - lib/foreigner/schema_dumper.rb
 - lib/foreigner.rb
 - test/helper.rb
-- test/mysql2_adapter_test.rb
-- test/reversible_test.rb
-- test/sql2003_test.rb
+- test/unit/command_recorder_test.rb
+- test/unit/mysql2_adapter_test.rb
+- test/unit/sql2003_test.rb
 has_rdoc: true
 homepage: http://github.com/matthuhiggins/foreigner
 licenses: []

data/test/reversible_test.rb

@@ -1,42 +0,0 @@
-require 'helper'
-
-class ReversibleTest < Foreigner::AdapterTest
-  include Foreigner::ConnectionAdapters::Mysql2Adapter
-  ActiveRecord::Migration::CommandRecorder.class_eval do
-    include Foreigner::Migration::CommandRecorder
-  end
-  
-  test 'invert_remove_foreign_key' do
-    recorder = ActiveRecord::Migration::CommandRecorder.new
-    recorded = recorder.add_foreign_key(:table1, :table2)[0]
-    assert_equal(
-      send(recorded[0], *recorded[1]),
-      send(*recorder.invert_remove_foreign_key(:table1, :table2))
-    )
-  end
-  test 'invert_remove_foreign_key with column' do
-    recorder = ActiveRecord::Migration::CommandRecorder.new
-    recorded = recorder.add_foreign_key(:table1, :table2, :column => :column1)[0]
-    assert_equal(
-      send(recorded[0], *recorded[1]),
-      send(*recorder.invert_remove_foreign_key(:table1, :table2, :column => :column1))
-    )
-  end
-  test 'invert_add_foreign_key' do
-    recorder = ActiveRecord::Migration::CommandRecorder.new
-    recorded = recorder.remove_foreign_key(:table1, :table2)[0]
-    assert_equal(
-      send(recorded[0], *recorded[1]),
-      send(*recorder.invert_add_foreign_key(:table1, :table2))
-    )
-  end
-  test 'invert_add_foreign_key with column' do
-    recorder = ActiveRecord::Migration::CommandRecorder.new
-    recorded = recorder.remove_foreign_key(:table1, :table2, :column => :column1)[0]
-    assert_equal(
-      send(recorded[0], *recorded[1]),
-      send(*recorder.invert_add_foreign_key(:table1, :table2, :column => :column1))
-    )
-  end
-  
-end