foreigner 1.1.1 → 1.1.2

data/lib/foreigner.rb

@@ -22,6 +22,7 @@ end
 
 Foreigner::Adapter.register 'mysql', 'foreigner/connection_adapters/mysql_adapter'
 Foreigner::Adapter.register 'mysql2', 'foreigner/connection_adapters/mysql2_adapter'
+Foreigner::Adapter.register 'jdbcmysql', 'foreigner/connection_adapters/mysql2_adapter'
 Foreigner::Adapter.register 'postgresql', 'foreigner/connection_adapters/postgresql_adapter'
 
-require 'foreigner/railtie' if defined?(Rails)
+require 'foreigner/railtie' if defined?(Rails)

data/lib/foreigner/connection_adapters/sql2003.rb

@@ -6,7 +6,12 @@ module Foreigner
       end
 
       def drop_table(*args)
-        disable_referential_integrity { super }
+        options = args.extract_options!
+        if options[:force]
+          disable_referential_integrity { super }
+        else
+          super
+        end
       end
 
       def add_foreign_key(from_table, to_table, options = {})

data/lib/foreigner/schema_dumper.rb

@@ -5,14 +5,22 @@ module Foreigner
     included do
       alias_method_chain :tables, :foreign_keys
     end
-    
+
     def tables_with_foreign_keys(stream)
       tables_without_foreign_keys(stream)
       @connection.tables.sort.each do |table|
+        next if ['schema_migrations', ignore_tables].flatten.any? do |ignored|
+          case ignored
+          when String; table == ignored
+          when Regexp; table =~ ignored
+          else
+            raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.'
+          end
+        end
         foreign_keys(table, stream)
       end
     end
-    
+
     private
       def foreign_keys(table_name, stream)
         if (foreign_keys = @connection.foreign_keys(table_name)).any?
@@ -20,7 +28,7 @@ module Foreigner
             statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
             statement_parts << foreign_key.to_table.inspect
             statement_parts << (':name => ' + foreign_key.options[:name].inspect)
-            
+
             if foreign_key.options[:column] != "#{foreign_key.to_table.singularize}_id"
               statement_parts << (':column => ' + foreign_key.options[:column].inspect)
             end
@@ -39,4 +47,4 @@ module Foreigner
         end
       end
   end
-end
+end

data/test/helper.rb

@@ -1,32 +1,48 @@
-require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
+
 require 'test/unit'
 require 'active_record'
 
-require File.expand_path('../../lib/foreigner', __FILE__)
-
 # Foreigner::Adapter.registered.values.each do |file_name|
 #   require file_name
 # end
 
-module Foreigner
-  class UnitTest < ActiveSupport::TestCase
-    private
-      def execute(sql, name = nil)
-        sql_statements << sql
-        sql
-      end
+module TestAdapterMethods
+  def execute(sql, name = nil)
+    sql_statements << sql
+    sql
+  end
+  
+  def quote_table_name(name)
+    quote_column_name(name).gsub('.', '`.`')
+  end
 
-      def quote_column_name(name)
-        "`#{name}`"
-      end
+  def quote_column_name(name)
+    "`#{name}`"
+  end
 
-      def quote_table_name(name)
-        quote_column_name(name).gsub('.', '`.`')
-      end
+  def sql_statements
+    @sql_statements ||= []
+  end
 
-      def sql_statements
-        @sql_statements ||= []
-      end
+  def drop_table(name, options = {})  
+  end
+
+  def disable_referential_integrity
+    @disable_referential_integrity = true
+    yield
+  end
+
+  private
+    def execute(sql, name = nil)
+      sql_statements << sql
+      sql
+    end
+end
+
+module Foreigner
+  class UnitTest < ActiveSupport::TestCase
   end
 
   class IntegrationTest < ActiveSupport::TestCase

data/test/unit/mysql2_adapter_test.rb

@@ -2,26 +2,33 @@ require 'helper'
 require 'foreigner/connection_adapters/mysql2_adapter'
 
 class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
-  include Foreigner::ConnectionAdapters::Mysql2Adapter
+  class Mysql2Adapter
+    include TestAdapterMethods
+    include Foreigner::ConnectionAdapters::Mysql2Adapter
+  end
+
+  setup do
+    @adapter = Mysql2Adapter.new
+  end
 
   test 'remove_foreign_key_sql by table' do
     assert_equal(
       "DROP FOREIGN KEY `suppliers_company_id_fk`",
-      remove_foreign_key_sql(:suppliers, :companies)
+      @adapter.remove_foreign_key_sql(:suppliers, :companies)
     )
   end
   
   test 'remove_foreign_key_sql by name' do
     assert_equal(
       "DROP FOREIGN KEY `belongs_to_supplier`",
-      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`",
-      remove_foreign_key_sql(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key_sql(:suppliers, :column => "ship_to_id")
     )
   end
 end

data/test/unit/schema_dumper_test.rb

@@ -0,0 +1,46 @@
+require 'helper'
+
+class Foreigner::SchemaDumperTest < Foreigner::UnitTest
+
+  class MockConnection
+    def tables
+      [ 'foo', 'bar' ]
+    end
+  end
+
+  class MockSchemaDumper
+    cattr_accessor :ignore_tables, :processed_tables
+    @@ignore_table = []
+    @@processed_tables = []
+
+    @connection = MockConnection.new
+
+    # need this here so ActiveRecord::Concern has something to redefine
+    def tables
+    end
+
+    include Foreigner::SchemaDumper
+
+    # override this method so we don't have to mock up
+    # all of the necessary scafolding for things to work
+    def foreign_keys(table, stream)
+      processed_tables << table
+    end
+
+    def tables(ignore_list)
+      ignore_tables = ignore_list
+      processed_table = nil
+    end
+  end
+
+  test 'all tables' do
+    MockSchemaDumper.ignore_tables = []
+    assert MockSchemaDumper.new.processed_tables.sort.to_s, "['bar', 'foo']"
+  end
+
+  test 'ignores tables' do
+    MockSchemaDumper.ignore_tables = ['foo']
+    assert MockSchemaDumper.new.processed_tables.to_s, "['bar']"
+  end
+end
+

data/test/unit/sql2003_test.rb

@@ -1,33 +1,50 @@
 require 'helper'
 
 class Foreigner::Sql2003Test < Foreigner::UnitTest
-  include Foreigner::ConnectionAdapters::Sql2003
+  class TestAdapter
+    include TestAdapterMethods
+    include Foreigner::ConnectionAdapters::Sql2003
+  end
+
+  setup do
+    @adapter = TestAdapter.new
+  end
+
+  test 'drop_table without force' do
+    @adapter.drop_table 'shoes'
+    assert !@adapter.instance_variable_get(:@disable_referential_integrity)
+  end
+
+  test 'drop_table with force' do
+    @adapter.drop_table 'shoes', force: true
+    assert @adapter.instance_variable_get(:@disable_referential_integrity)
+  end
 
   test 'add_without_options' do
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id)",
-      add_foreign_key(:employees, :companies)
+      @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)",
-      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)",
-      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)",
-      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
   
@@ -35,7 +52,7 @@ 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 CASCADE",
-      add_foreign_key(:employees, :companies, :dependent => :delete)
+      @adapter.add_foreign_key(:employees, :companies, :dependent => :delete)
     )
   end
   
@@ -43,7 +60,7 @@ 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 SET NULL",
-      add_foreign_key(:employees, :companies, :dependent => :nullify)
+      @adapter.add_foreign_key(:employees, :companies, :dependent => :nullify)
     )
   end
   
@@ -51,7 +68,7 @@ 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 RESTRICT",
-      add_foreign_key(:employees, :companies, :dependent => :restrict)
+      @adapter.add_foreign_key(:employees, :companies, :dependent => :restrict)
     )
   end
 
@@ -59,28 +76,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",
-      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`",
-      remove_foreign_key(:suppliers, :companies)
+      @adapter.remove_foreign_key(:suppliers, :companies)
     )
   end
   
   test 'remove_by_name' do
     assert_equal(
       "ALTER TABLE `suppliers` DROP CONSTRAINT `belongs_to_supplier`",
-      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`",
-      remove_foreign_key(:suppliers, :column => "ship_to_id")
+      @adapter.remove_foreign_key(:suppliers, :column => "ship_to_id")
     )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-09 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161584820 !ruby/object:Gem::Requirement
+  requirement: &70097178167620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,18 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161584820
+  version_requirements: *70097178167620
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161584240 !ruby/object:Gem::Requirement
+  requirement: &70097178167160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc5
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2161584240
+  version_requirements: *70097178167160
 description: Adds helpers to migrations and dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
@@ -59,6 +59,7 @@ files:
 - test/unit/mysql2_adapter_test.rb
 - test/unit/mysql_adapter_test.rb
 - test/unit/postgresql_adapter_test.rb
+- test/unit/schema_dumper_test.rb
 - test/unit/sql2003_test.rb
 homepage: http://github.com/matthuhiggins/foreigner
 licenses: []
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: foreigner
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Foreign Keys for Rails