foreigner 1.0.3 → 1.1.0

data/Rakefile

@@ -1,10 +1,14 @@
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+# begin
+#   require 'bundler/setup'
+# rescue LoadError
+#   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+# end
 
 desc 'Default: run unit tests.'
 task :default => :test
 
+require 'rake/testtask'
 desc 'Test the foreigner plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -12,12 +16,3 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-desc 'Generate documentation for the foreigner plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Foreigner'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/foreigner.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module Foreigner
   extend ActiveSupport::Autoload
   autoload :Adapter
@@ -18,7 +20,8 @@ module Foreigner
   end
 end
 
+Foreigner::Adapter.register 'mysql', 'foreigner/connection_adapters/mysql_adapter'
 Foreigner::Adapter.register 'mysql2', 'foreigner/connection_adapters/mysql2_adapter'
 Foreigner::Adapter.register 'postgresql', 'foreigner/connection_adapters/postgresql_adapter'
 
-require 'foreigner/railtie'
+require 'foreigner/railtie' if defined?(Rails)

data/lib/foreigner/adapter.rb

@@ -19,4 +19,4 @@ module Foreigner
       end
     end
   end
-end
+end

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

@@ -49,7 +49,7 @@ module Foreigner
       #   change_table :accounts do |t|
       #     t.remove_index :name => :party_foreign_key
       #   end
-      def remove_foreign_key(options = {})
+      def remove_foreign_key(options)
         @base.remove_foreign_key(@table_name, options)
       end
     

data/lib/foreigner/connection_adapters/mysql2_adapter.rb

@@ -2,6 +2,12 @@ module Foreigner
   module ConnectionAdapters
     module Mysql2Adapter
       include Foreigner::ConnectionAdapters::Sql2003
+
+      def drop_table(table_name, options = {})
+        execute "SET FOREIGN_KEY_CHECKS=0"
+        execute "DROP TABLE #{quote_table_name(table_name)}"
+        execute "SET FOREIGN_KEY_CHECKS=1"
+      end
       
       def remove_foreign_key_sql(table, options)
         if Hash === options

data/lib/foreigner/connection_adapters/mysql_adapter.rb

@@ -0,0 +1 @@
+p "WARNING: Please upgrade to mysql2. The old mysql adapter is not supported by foreigner."

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -3,6 +3,10 @@ module Foreigner
     module PostgreSQLAdapter
       include Foreigner::ConnectionAdapters::Sql2003
 
+      def drop_table(table_name, options = {})
+        execute "DROP TABLE #{quote_table_name(table_name)} CASCADE"
+      end
+
       def foreign_keys(table_name)
         fk_info = select_all %{
           SELECT t2.relname AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confdeltype AS dependency
@@ -11,7 +15,10 @@ module Foreigner
           JOIN pg_class t2 ON c.confrelid = t2.oid
           JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
           JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
-          WHERE c.contype = 'f' AND t1.relname = '#{table_name}'
+          JOIN pg_namespace t3 ON c.connamespace = t3.oid
+          WHERE c.contype = 'f'
+            AND t1.relname = '#{table_name}'
+            AND t3.nspname = ANY (current_schemas(false))
           ORDER BY c.conname
         }
         

data/lib/foreigner/connection_adapters/sql2003.rb

@@ -26,7 +26,7 @@ module Foreigner
         sql
       end
 
-      def remove_foreign_key(table, 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,7 +9,7 @@ module Foreigner
         record(:remove_foreign_key, args)
       end
 
-      def invert_add_foreign_key(args)#from_table, to_table, add_options = {})
+      def invert_add_foreign_key(args)
         from_table, to_table, add_options = *args
         add_options ||= {}
 
@@ -25,6 +25,4 @@ module Foreigner
       end
     end
   end
-end
-      
-
+end

data/test/helper.rb

@@ -1,17 +1,18 @@
 require 'rubygems'
 require 'test/unit'
-require 'rails/all'
+require 'active_record'
 
 require File.expand_path('../../lib/foreigner', __FILE__)
 
-Foreigner::Adapter.registered.values.each do |file_name|
-  require file_name
-end
+# 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
 
@@ -22,6 +23,10 @@ module Foreigner
       def quote_table_name(name)
         quote_column_name(name).gsub('.', '`.`')
       end
+
+      def sql_statements
+        @sql_statements ||= []
+      end
   end
 
   class IntegrationTest < ActiveSupport::TestCase

data/test/unit/mysql2_adapter_test.rb

@@ -1,23 +1,40 @@
 require 'helper'
+require 'foreigner/connection_adapters/mysql2_adapter'
 
 class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
   include Foreigner::ConnectionAdapters::Mysql2Adapter
+  
+  test 'drop_table' do
+    drop_table :widgets
+    assert_equal(
+      [
+        "SET FOREIGN_KEY_CHECKS=0",
+        "DROP TABLE `widgets`",
+        "SET FOREIGN_KEY_CHECKS=1"
+      ],
+      sql_statements
+    )
+  end
+
+  test 'drop_table with stupid options hash' do
+    drop_table :widgets, {}
+  end
 
-  test 'remove_by_table' do
+  test 'remove_foreign_key_sql by table' do
     assert_equal(
       "DROP FOREIGN KEY `suppliers_company_id_fk`",
       remove_foreign_key_sql(:suppliers, :companies)
     )
   end
   
-  test 'remove_by_name' do
+  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")
     )
   end
   
-  test 'remove_by_column' do
+  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")

data/test/unit/mysql_adapter_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class Foreigner::MysqlAdapterTest < Foreigner::UnitTest
+  test 'warning' do
+    output = capture(:stdout) do
+      require 'foreigner/connection_adapters/mysql_adapter'
+    end
+    assert_match /WARNING: Please upgrade to mysql2. The old mysql adapter is not supported by foreigner./, output
+  end
+end

data/test/unit/postgresql_adapter_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+require 'foreigner/connection_adapters/postgresql_adapter'
+
+class Foreigner::PostgreSQLAdapterTest < Foreigner::UnitTest
+  include Foreigner::ConnectionAdapters::PostgreSQLAdapter
+
+  test 'drop_table' do
+    assert_equal(
+      "DROP TABLE `widgets` CASCADE",
+      drop_table(:widgets)
+    )
+  end
+
+  test 'drop_table with stupid options hash' do
+    drop_table :widgets, {}
+  end
+end

metadata

@@ -1,38 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foreigner
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2162120540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2162120540
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2162120060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0.rc5
+  type: :development
+  prerelease: false
+  version_requirements: *2162120060
 description: Adds helpers to migrations and dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -40,6 +47,7 @@ files:
 - lib/foreigner/connection_adapters/abstract/schema_definitions.rb
 - lib/foreigner/connection_adapters/abstract/schema_statements.rb
 - lib/foreigner/connection_adapters/mysql2_adapter.rb
+- lib/foreigner/connection_adapters/mysql_adapter.rb
 - lib/foreigner/connection_adapters/postgresql_adapter.rb
 - lib/foreigner/connection_adapters/sql2003.rb
 - lib/foreigner/migration/command_recorder.rb
@@ -49,34 +57,31 @@ files:
 - test/helper.rb
 - test/unit/command_recorder_test.rb
 - test/unit/mysql2_adapter_test.rb
+- test/unit/mysql_adapter_test.rb
+- test/unit/postgresql_adapter_test.rb
 - test/unit/sql2003_test.rb
-has_rdoc: true
 homepage: http://github.com/matthuhiggins/foreigner
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: foreigner
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Foreign Keys for Rails
 test_files: []
-