dwilkie-foreigner 0.5.0 → 0.5.1

data/lib/foreigner/connection_adapters/sqlite3_adapter.rb

@@ -2,6 +2,37 @@ require 'foreigner/connection_adapters/sql_2003'
 
 module Foreigner
   module ConnectionAdapters
+    module SQLite3Adapter
+      include Foreigner::ConnectionAdapters::Sql2003
+
+      def foreign_keys(table_name)
+        foreign_keys = []
+        create_table_info = select_value %{
+SELECT sql
+FROM sqlite_master
+WHERE sql LIKE '%FOREIGN KEY%'
+AND name = '#{table_name}'
+}
+      unless create_table_info.nil?
+        fk_columns = create_table_info.scan(/FOREIGN KEY\s*\(\"([^\"]+)\"\)/)
+        fk_tables = create_table_info.scan(/REFERENCES\s*\"([^\"]+)\"/)
+        fk_references = create_table_info.scan(/REFERENCES[^\,]+/)
+        if fk_columns.size == fk_tables.size && fk_references.size == fk_columns.size
+          fk_columns.each_with_index do |fk_column, index|
+            if fk_references[index] =~ /ON DELETE CASCADE/
+              fk_references[index] = :delete
+            elsif fk_references[index] =~ /ON DELETE SET NULL/
+              fk_references[index] = :nullify
+            else
+              fk_references[index] = nil
+            end
+            foreign_keys << ForeignKeyDefinition.new(table_name, fk_tables[index][0], :column => fk_column[0], :dependent => fk_references[index])
+          end
+        end
+      end
+      foreign_keys
+      end
+    end
     module TableDefinition
       class ForeignKey < Struct.new(:base, :to_table, :options)
 
@@ -59,38 +90,6 @@ module Foreigner
         end
       end
     end
-
-    module SQLite3Adapter
-      include Foreigner::ConnectionAdapters::Sql2003
-
-      def foreign_keys(table_name)
-        foreign_keys = []
-        create_table_info = select_value %{
-SELECT sql
-FROM sqlite_master
-WHERE sql LIKE '%FOREIGN KEY%'
-AND name = '#{table_name}'
-}
-      unless create_table_info.nil?
-        fk_columns = create_table_info.scan(/FOREIGN KEY\s*\(\"([^\"]+)\"\)/)
-        fk_tables = create_table_info.scan(/REFERENCES\s*\"([^\"]+)\"/)
-        fk_references = create_table_info.scan(/REFERENCES[^\,]+/)
-        if fk_columns.size == fk_tables.size && fk_references.size == fk_columns.size
-          fk_columns.each_with_index do |fk_column, index|
-            if fk_references[index] =~ /ON DELETE CASCADE/
-              fk_references[index] = :delete
-            elsif fk_references[index] =~ /ON DELETE SET NULL/
-              fk_references[index] = :nullify
-            else
-              fk_references[index] = nil
-            end
-            foreign_keys << ForeignKeyDefinition.new(table_name, fk_tables[index][0], :column => fk_column[0], :dependent => fk_references[index])
-          end
-        end
-      end
-      foreign_keys
-      end
-    end
   end
 end
 

data/lib/foreigner.rb

@@ -3,6 +3,23 @@ require 'foreigner/connection_adapters/abstract/schema_definitions'
 require 'foreigner/connection_adapters/sql_2003'
 require 'foreigner/schema_dumper'
 
+module Foreigner
+  mattr_accessor :adapters
+  self.adapters = {}
+
+  class << self
+    def register(adapter_name, file_name)
+      adapters[adapter_name] = file_name
+    end
+
+    def load_adapter!(adapter_name)
+      if adapters.key?(adapter_name)
+        require adapters[adapter_name]
+      end
+    end
+  end
+end
+
 module ActiveRecord
   module ConnectionAdapters
     include Foreigner::ConnectionAdapters::SchemaStatements
@@ -12,14 +29,5 @@ module ActiveRecord
   SchemaDumper.class_eval do
     include Foreigner::SchemaDumper
   end
-
-  Base.class_eval do
-    if %w(sqlite3).include? connection_pool.spec.config[:adapter].downcase
-      require "foreigner/connection_adapters/#{connection_pool.spec.config[:adapter].downcase}_adapter"
-    end
-    if %w(mysql postgresql).include? connection_pool.spec.config[:adapter].downcase
-      require "foreigner/connection_adapters/#{connection_pool.spec.config[:adapter].downcase}_adapter"
-    end
-  end
 end
 

data/test/helper.rb

@@ -1,8 +1,11 @@
+ENV["RAILS_ENV"] = "test"
 require 'test/unit'
 require 'rubygems'
 require 'active_support'
 require 'active_support/test_case'
 require 'active_record'
 require 'active_record/test_case'
+require 'active_record/connection_adapters/sqlite3_adapter'
 require 'active_record/connection_adapters/mysql_adapter'
-require 'foreigner'
+require 'foreigner'
+

data/test/mysql_adapter_test.rb

@@ -1,7 +1,8 @@
 require File.dirname(__FILE__) + '/helper'
+require "foreigner/connection_adapters/mysql_adapter"
 
 class MysqlAdapterTest < ActiveRecord::TestCase
-  include Foreigner::MysqlAdapter
+  include Foreigner::ConnectionAdapters::MysqlAdapter
 
   def test_add_without_options
     assert_equal(
@@ -9,28 +10,28 @@ class MysqlAdapterTest < ActiveRecord::TestCase
       add_foreign_key(:employees, :companies)
     )
   end
-  
+
   def test_add_with_name
     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')
     )
   end
-  
+
   def test_add_with_column
     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')
-    ) 
+    )
   end
-  
+
   def test_add_with_column_and_name
     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')
     )
   end
-  
+
   def test_add_with_delete_dependency
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
@@ -38,7 +39,7 @@ class MysqlAdapterTest < ActiveRecord::TestCase
       add_foreign_key(:employees, :companies, :dependent => :delete)
     )
   end
-  
+
   def test_add_with_nullify_dependency
     assert_equal(
       "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
@@ -46,38 +47,39 @@ class MysqlAdapterTest < ActiveRecord::TestCase
       add_foreign_key(:employees, :companies, :dependent => :nullify)
     )
   end
-  
+
   def test_remove_by_table
     assert_equal(
       "ALTER TABLE `suppliers` DROP FOREIGN KEY `suppliers_company_id_fk`",
       remove_foreign_key(:suppliers, :companies)
     )
   end
-  
+
   def test_remove_by_name
     assert_equal(
       "ALTER TABLE `suppliers` DROP FOREIGN KEY `belongs_to_supplier`",
       remove_foreign_key(:suppliers, :name => "belongs_to_supplier")
     )
   end
-  
+
   def test_remove_by_column
     assert_equal(
       "ALTER TABLE `suppliers` DROP FOREIGN KEY `suppliers_ship_to_id_fk`",
       remove_foreign_key(:suppliers, :column => "ship_to_id")
     )
   end
-  
+
   private
     def execute(sql, name = nil)
       sql
     end
-  
+
     def quote_column_name(name)
       "`#{name}`"
     end
-    
+
     def quote_table_name(name)
       quote_column_name(name).gsub('.', '`.`')
     end
-end
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dwilkie-foreigner
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Wilkie
@@ -50,18 +55,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: foreigner
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 1
 summary: Foreign keys for Rails migrations with limited SQLite support