foreigner 0.9.1 → 0.9.2

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

@@ -14,63 +14,60 @@ module Foreigner
     module Table
       def self.included(base)
         base.class_eval do
-          include InstanceMethods
           alias_method_chain :references, :foreign_keys
         end
       end
 
-      module InstanceMethods
-        # Adds a new foreign key to the table. +to_table+ can be a single Symbol, or
-        # an Array of Symbols. See SchemaStatements#add_foreign_key
-        #
-        # ===== Examples
-        # ====== Creating a simple foreign key
-        #  t.foreign_key(:people)
-        # ====== Defining the column
-        #  t.foreign_key(:people, :column => :sender_id)
-        # ====== Creating a named foreign key
-        #  t.foreign_key(:people, :column => :sender_id, :name => 'sender_foreign_key')
-        # ====== Defining the column of the +to_table+.
-        #  t.foreign_key(:people, :column => :sender_id, :primary_key => :person_id)
-        def foreign_key(to_table, options = {})
-          @base.add_foreign_key(@table_name, to_table, options)
-        end
+      # Adds a new foreign key to the table. +to_table+ can be a single Symbol, or
+      # an Array of Symbols. See SchemaStatements#add_foreign_key
+      #
+      # ===== Examples
+      # ====== Creating a simple foreign key
+      #  t.foreign_key(:people)
+      # ====== Defining the column
+      #  t.foreign_key(:people, :column => :sender_id)
+      # ====== Creating a named foreign key
+      #  t.foreign_key(:people, :column => :sender_id, :name => 'sender_foreign_key')
+      # ====== Defining the column of the +to_table+.
+      #  t.foreign_key(:people, :column => :sender_id, :primary_key => :person_id)
+      def foreign_key(to_table, options = {})
+        @base.add_foreign_key(@table_name, to_table, options)
+      end
+  
+      # Remove the given foreign key from the table.
+      #
+      # ===== Examples
+      # ====== Remove the suppliers_company_id_fk in the suppliers table.
+      #   t.remove_foreign_key :companies
+      # ====== Remove the foreign key named accounts_branch_id_fk in the accounts table.
+      #   remove_foreign_key :column => :branch_id
+      # ====== Remove the foreign key named party_foreign_key in the accounts table.
+      #   remove_index :name => :party_foreign_key
+      def remove_foreign_key(options = {})
+        @base.remove_foreign_key(@table_name, options)
+      end
     
-        # Remove the given foreign key from the table.
-        #
-        # ===== Examples
-        # ====== Remove the suppliers_company_id_fk in the suppliers table.
-        #   t.remove_foreign_key :companies
-        # ====== Remove the foreign key named accounts_branch_id_fk in the accounts table.
-        #   remove_foreign_key :column => :branch_id
-        # ====== Remove the foreign key named party_foreign_key in the accounts table.
-        #   remove_index :name => :party_foreign_key
-        def remove_foreign_key(options = {})
-          @base.remove_foreign_key(@table_name, options)
-        end
-      
-        # Adds a :foreign_key option to Table.references.
-        # If :foreign_key is true, a foreign key constraint is added to the table.
-        # You can also specify a hash, which is passed as foreign key options.
-        # 
-        # ===== Examples
-        # ====== Add goat_id column and a foreign key to the goats table.
-        #  t.references(:goat, :foreign_key => true)
-        # ====== Add goat_id column and a cascading foreign key to the goats table.
-        #  t.references(:goat, :foreign_key => {:dependent => :delete})
-        # 
-        # Note: No foreign key is created if :polymorphic => true is used.
-        def references_with_foreign_keys(*args)
-          options = args.extract_options!
-          polymorphic = options[:polymorphic]
-          fk_options = options.delete(:foreign_key)
+      # Adds a :foreign_key option to Table.references.
+      # If :foreign_key is true, a foreign key constraint is added to the table.
+      # You can also specify a hash, which is passed as foreign key options.
+      # 
+      # ===== Examples
+      # ====== Add goat_id column and a foreign key to the goats table.
+      #  t.references(:goat, :foreign_key => true)
+      # ====== Add goat_id column and a cascading foreign key to the goats table.
+      #  t.references(:goat, :foreign_key => {:dependent => :delete})
+      # 
+      # Note: No foreign key is created if :polymorphic => true is used.
+      def references_with_foreign_keys(*args)
+        options = args.extract_options!
+        polymorphic = options[:polymorphic]
+        fk_options = options.delete(:foreign_key)
 
-          references_without_foreign_keys(*(args.dup << options))
+        references_without_foreign_keys(*(args.dup << options))
 
-          if fk_options && !polymorphic
-            fk_options = {} if fk_options == true
-            args.each { |to_table| foreign_key(to_table, fk_options) }
-          end
+        if fk_options && !polymorphic
+          fk_options = {} if fk_options == true
+          args.each { |to_table| foreign_key(to_table, fk_options) }
         end
       end
     end

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -30,6 +30,7 @@ module Foreigner
           WHERE tc.constraint_type = 'FOREIGN KEY'
             AND tc.constraint_catalog = '#{@config[:database]}'
             AND tc.table_name = '#{table_name}'
+            AND tc.table_schema = ANY (current_schemas(false))
         }
         
         fk_info.map do |row|

data/lib/foreigner/schema_dumper.rb

@@ -2,44 +2,41 @@ module Foreigner
   module SchemaDumper
     def self.included(base)
       base.class_eval do
-        include InstanceMethods
         alias_method_chain :tables, :foreign_keys
       end
     end
     
-    module InstanceMethods
-      def tables_with_foreign_keys(stream)
-        tables_without_foreign_keys(stream)
-        @connection.tables.sort.each do |table|
-          foreign_keys(table, stream)
-        end
+    def tables_with_foreign_keys(stream)
+      tables_without_foreign_keys(stream)
+      @connection.tables.sort.each do |table|
+        foreign_keys(table, stream)
       end
-      
-      private
-        def foreign_keys(table_name, stream)
-          if (foreign_keys = @connection.foreign_keys(table_name)).any?
-            add_foreign_key_statements = foreign_keys.map do |foreign_key|
-              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
-              if foreign_key.options[:primary_key] != 'id'
-                statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
-              end
-              if foreign_key.options[:dependent].present?
-                statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
-              end
-
-              '  ' + statement_parts.join(', ')
+    end
+    
+    private
+      def foreign_keys(table_name, stream)
+        if (foreign_keys = @connection.foreign_keys(table_name)).any?
+          add_foreign_key_statements = foreign_keys.map do |foreign_key|
+            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
+            if foreign_key.options[:primary_key] != 'id'
+              statement_parts << (':primary_key => ' + foreign_key.options[:primary_key].inspect)
+            end
+            if foreign_key.options[:dependent].present?
+              statement_parts << (':dependent => ' + foreign_key.options[:dependent].inspect)
             end
 
-            stream.puts add_foreign_key_statements.sort.join("\n")
-            stream.puts
+            '  ' + statement_parts.join(', ')
           end
+
+          stream.puts add_foreign_key_statements.sort.join("\n")
+          stream.puts
         end
-    end
+      end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: foreigner
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+  prerelease: 
+  version: 0.9.2
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -07:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -53,25 +49,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 6
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
       version: 1.3.5
 requirements: []
 
 rubyforge_project: foreigner
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Foreign keys for Rails