matthuhiggins-foreigner 0.1.0 → 0.2.0

data/lib/foreigner.rb

@@ -1,6 +1,5 @@
 require 'foreigner/connection_adapters/abstract/schema_statements'
 require 'foreigner/connection_adapters/abstract/schema_definitions'
-require 'foreigner/connection_adapters/mysql_adapter'
 require 'foreigner/schema_dumper'
 
 module ActiveRecord
@@ -8,10 +7,6 @@ module ActiveRecord
     AbstractAdapter.class_eval do
       include Foreigner::AdapterMethods
     end
-    
-    MysqlAdapter.class_eval do
-      include Foreigner::MysqlAdapter
-    end
 
     TableDefinition.class_eval do
       include Foreigner::TableDefinition
@@ -25,4 +20,10 @@ module ActiveRecord
   SchemaDumper.class_eval do
     include Foreigner::SchemaDumper
   end
+  
+  Base.class_eval do
+    if ['MySQL', 'PostgreSQL'].include? connection.adapter_name
+      require "foreigner/connection_adapters/#{connection.adapter_name.downcase}_adapter"
+    end
+  end
 end

data/lib/foreigner/connection_adapters/mysql_adapter.rb

@@ -1,84 +1,46 @@
-module Foreigner
-  module MysqlAdapter
-    def supports_foreign_keys?
-      true
-    end
-    
-    def add_foreign_key(from_table, to_table, options = {})
-      column  = options[:column] || "#{to_table.to_s.singularize}_id"
-      foreign_key_name = foreign_key_name(from_table, column, options)
+require 'foreigner/connection_adapters/sql_2003'
 
-      sql =
-        "ALTER TABLE #{quote_table_name(from_table)} " +
-        "ADD CONSTRAINT #{quote_column_name(foreign_key_name)} " +
-        foreign_key_definition(to_table, options)
+module Foreigner
+  module ConnectionAdapters
+    module MysqlAdapter
+      include Foreigner::ConnectionAdapters::Sql2003
       
-      execute(sql)
-    end
-    
-    def foreign_key_definition(to_table, options = {})
-      column  = options[:column] || "#{to_table.to_s.singularize}_id"
-      dependency = dependency_sql(options[:dependent])
-
-      sql = "FOREIGN KEY (#{quote_column_name(column)}) REFERENCES #{quote_table_name(to_table)}(id)"
-      sql << " #{dependency}" unless dependency.blank?
-      sql
-    end
-
-    def remove_foreign_key(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
-
-      execute "ALTER TABLE #{quote_table_name(table)} DROP FOREIGN KEY #{quote_column_name(foreign_key_name)}"
-    end
-    
-    def foreign_keys(table_name)
-      foreign_keys = []
-      fk_info = select_all %{
-        SELECT fk.referenced_table_name as 'to_table'
-              ,fk.column_name as 'column'
-              ,fk.constraint_name as 'name'
-        FROM information_schema.key_column_usage fk
-        WHERE fk.referenced_column_name is not null
-          AND fk.table_schema = '#{@config[:database]}'
-          AND fk.table_name = '#{table_name}'
-      }
-
-      create_table_info = select_one("SHOW CREATE TABLE #{quote_table_name(table_name)}")["Create Table"]
-
-      fk_info.each do |row|
-        options = {:column => row['column'], :name => row['name']}
-        if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .* ON DELETE (CASCADE|SET NULL)/
-          if $1 == 'CASCADE'
-            options[:dependent] = :delete
-          elsif $1 == 'SET NULL'
-            options[:dependent] = :nullify
+      def foreign_keys(table_name)
+        foreign_keys = []
+        fk_info = select_all %{
+          SELECT fk.referenced_table_name as 'to_table'
+                ,fk.column_name as 'column'
+                ,fk.constraint_name as 'name'
+          FROM information_schema.key_column_usage fk
+          WHERE fk.referenced_column_name is not null
+            AND fk.table_schema = '#{@config[:database]}'
+            AND fk.table_name = '#{table_name}'
+        }
+
+        create_table_info = select_one("SHOW CREATE TABLE #{quote_table_name(table_name)}")["Create Table"]
+
+        fk_info.each do |row|
+          options = {:column => row['column'], :name => row['name']}
+          if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .* ON DELETE (CASCADE|SET NULL)/
+            if $1 == 'CASCADE'
+              options[:dependent] = :delete
+            elsif $1 == 'SET NULL'
+              options[:dependent] = :nullify
+            end
           end
+          foreign_keys << ForeignKeyDefinition.new(table_name, row['to_table'], options)
         end
-        foreign_keys << ForeignKeyDefinition.new(table_name, row['to_table'], options)
-      end
       
-      foreign_keys
-    end
-
-    private
-      def foreign_key_name(table, column, options = {})
-        if options[:name]
-          options[:name]
-        else
-          "#{table}_#{column}_fk"
-        end
+        foreign_keys
       end
+    end
+  end
+end
 
-      def dependency_sql(dependency)
-        case dependency
-          when :nullify then "ON DELETE SET NULL"
-          when :delete  then "ON DELETE CASCADE"
-          else ""
-        end
-      end
+module ActiveRecord
+  module ConnectionAdapters
+    MysqlAdapter.class_eval do
+      include Foreigner::ConnectionAdapters::MysqlAdapter
+    end
   end
 end

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -0,0 +1,54 @@
+require 'foreigner/connection_adapters/sql_2003'
+
+module Foreigner
+  module ConnectionAdapters
+    module PostgreSQLAdapter
+      include Foreigner::ConnectionAdapters::Sql2003
+      
+      def foreign_keys(table_name)
+        foreign_keys = []
+
+        fk_info = select_all %{
+          select tc.constraint_name as name
+                ,ccu.table_name as to_table
+                ,kcu.column_name as column
+                ,rc.delete_rule as dependency
+          from information_schema.table_constraints tc
+          join information_schema.key_column_usage kcu
+            on tc.constraint_catalog = kcu.constraint_catalog
+           and tc.constraint_schema = kcu.constraint_schema
+           and tc.constraint_name = kcu.constraint_name
+          join information_schema.referential_constraints rc
+            on tc.constraint_catalog = rc.constraint_catalog
+           and tc.constraint_schema = rc.constraint_schema
+           and tc.constraint_name = rc.constraint_name
+          join information_schema.constraint_column_usage ccu
+            on tc.constraint_catalog = ccu.constraint_catalog
+           and tc.constraint_schema = ccu.constraint_schema
+           and tc.constraint_name = ccu.constraint_name
+          where tc.constraint_type = 'FOREIGN KEY'
+            and tc.constraint_catalog = '#{@config[:database]}'
+            and tc.table_name = '#{table_name}'
+        }
+        
+        fk_info.inject([]) do |foreign_keys, row|
+          options = {:column => row['column'], :name => row['name']}
+          if row['dependency'] == 'CASCADE'
+            options[:dependent] = :delete
+          elsif row['dependency'] == 'SET NULL'
+            options[:dependent] = :nullify
+          end
+          foreign_keys << ForeignKeyDefinition.new(table_name, row['to_table'], options)
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    PostgreSQLAdapter.class_eval do
+      include Foreigner::ConnectionAdapters::PostgreSQLAdapter
+    end
+  end
+end

data/lib/foreigner/connection_adapters/sql_2003.rb

@@ -0,0 +1,57 @@
+module Foreigner
+  module ConnectionAdapters
+    module Sql2003
+      def supports_foreign_keys?
+        true
+      end
+    
+      def add_foreign_key(from_table, to_table, options = {})
+        column  = options[:column] || "#{to_table.to_s.singularize}_id"
+        foreign_key_name = foreign_key_name(from_table, column, options)
+
+        sql =
+          "ALTER TABLE #{quote_table_name(from_table)} " +
+          "ADD CONSTRAINT #{quote_column_name(foreign_key_name)} " +
+          foreign_key_definition(to_table, options)
+      
+        execute(sql)
+      end
+    
+      def foreign_key_definition(to_table, options = {})
+        column  = options[:column] || "#{to_table.to_s.singularize}_id"
+        dependency = dependency_sql(options[:dependent])
+
+        sql = "FOREIGN KEY (#{quote_column_name(column)}) REFERENCES #{quote_table_name(to_table)}(id)"
+        sql << " #{dependency}" unless dependency.blank?
+        sql
+      end
+
+      def remove_foreign_key(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
+
+        execute "ALTER TABLE #{quote_table_name(table)} DROP FOREIGN KEY #{quote_column_name(foreign_key_name)}"
+      end
+    
+      private
+        def foreign_key_name(table, column, options = {})
+          if options[:name]
+            options[:name]
+          else
+            "#{table}_#{column}_fk"
+          end
+        end
+
+        def dependency_sql(dependency)
+          case dependency
+            when :nullify then "ON DELETE SET NULL"
+            when :delete  then "ON DELETE CASCADE"
+            else ""
+          end
+        end
+    end
+  end
+end

data/test/helper.rb

@@ -5,5 +5,4 @@ require 'active_support/test_case'
 require 'active_record'
 require 'active_record/test_case'
 require 'active_record/connection_adapters/mysql_adapter'
-$:.unshift File.dirname(__FILE__) + '/../lib/'
 require 'foreigner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthuhiggins-foreigner
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -29,14 +29,15 @@ files:
 - lib/foreigner
 - lib/foreigner/schema_dumper.rb
 - lib/foreigner/connection_adapters
+- lib/foreigner/connection_adapters/sql_2003.rb
 - lib/foreigner/connection_adapters/mysql_adapter.rb
+- lib/foreigner/connection_adapters/postgresql_adapter.rb
 - lib/foreigner/connection_adapters/abstract/schema_definitions.rb
 - lib/foreigner/connection_adapters/abstract/schema_statements.rb
 - test/helper.rb
 - test/mysql_adapter_test.rb
 has_rdoc: false
 homepage: http://github.com/matthuhiggins/foreigner/tree/master
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: foreigner
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 1
 summary: Foreign keys for Rails migrations