matthuhiggins-foreigner 0.3.1 → 0.4.0

data/README

@@ -61,14 +61,7 @@ Lastly, a name can be specified for the foreign key constraint:
 Create/Change Table Shorthand
 -----------------------------
 
-Foreigner adds extra behavior to create_table and change_table, which lets you define foreign keys using shorthand.
-
-Create the comments table with a foreign key to posts:
-
-create_table :comments do |t|
-  t.integer :post_id
-  t.foreign_key :posts
-end
+Foreigner adds extra behavior to change_table, which lets you define foreign keys using shorthand.
 
 Add a missing foreign key to comments:
 
@@ -85,7 +78,7 @@ Additional t.references option
 Foreigner extends table.references with the :foreign_key option. Pass true, and the default
 foreign key options are used:
 
-create_table :comments do |t|
+change_table :comments do |t|
   t.references :post, :foreign_key => true
 end
 

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

@@ -2,7 +2,7 @@ module Foreigner
   module ConnectionAdapters
     class ForeignKeyDefinition < Struct.new(:from_table, :to_table, :options) #:nodoc:
     end
-
+    
     module SchemaDefinitions
       def self.included(base)
         base::TableDefinition.class_eval do
@@ -16,75 +16,32 @@ module Foreigner
     end
   
     module TableDefinition
-      class ForeignKey < Struct.new(:base, :to_table, :options)
-        def to_sql
-          base.foreign_key_definition(to_table, options)
-        end
-        alias to_s :to_sql
-      end
-
       def self.included(base)
         base.class_eval do
           include InstanceMethods
           alias_method_chain :references, :foreign_keys
-          alias_method_chain :to_sql, :foreign_keys
         end
       end
     
       module InstanceMethods
-        # Adds a :foreign_key option to TableDefinition.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.
-        # Note: If no name is specified, the database driver creates one for you!
         def references_with_foreign_keys(*args)
           options = args.extract_options!
-          fk_options = options.delete(:foreign_key)
-
-          if fk_options && !options[:polymorphic]
-            fk_options = {} if fk_options == true
-            args.each { |to_table| foreign_key(to_table, fk_options) }
+          if options[:foreign_key].present?
+            ActiveSupport::Deprecation.warn(
+              ':foreign_key option is deprecated inside create_table. ' +
+              'to add a foreign key, use add_foreign_key', caller[0,10]
+            )
           end
 
           references_without_foreign_keys(*(args << options))
         end
     
-        # Defines a foreign key for 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 = {})
-          if @base.supports_foreign_keys?
-            to_table = to_table.to_s.pluralize if ActiveRecord::Base.pluralize_table_names
-            foreign_keys << ForeignKey.new(@base, to_table, options)
-          end
+          ActiveSupport::Deprecation.warn(
+            'adding a foreign key inside create_table is deprecated. ' +
+            'to add a foreign key, use add_foreign_key', caller[0,10]
+          )
         end
-      
-        def to_sql_with_foreign_keys
-          sql = to_sql_without_foreign_keys
-          sql << ', ' << (foreign_keys * ', ') if foreign_keys.present?
-          sql
-        end
-      
-        private
-          def foreign_keys
-            @foreign_keys ||= []
-          end
       end
     end
 
@@ -142,7 +99,7 @@ module Foreigner
           polymorphic = options[:polymorphic]
           fk_options = options.delete(:foreign_key)
 
-          references_without_foreign_keys(*(args << options))
+          references_without_foreign_keys(*(args.dup << options))
 
           if fk_options && !polymorphic
             fk_options = {} if fk_options == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthuhiggins-foreigner
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-12-25 00:00:00 -08:00
 default_executable: 
 dependencies: []