matthuhiggins-foreigner 0.7.1 → 0.8.0

data/README.rdoc

@@ -83,7 +83,7 @@ foreign key options are used:
 An options hash can also be passed. It accepts the same options as add_foreign_key:
 
   change_table :comments do |t|
-    t.references :author, :foreign_key => {:dependent => :destroy}
+    t.references :author, :foreign_key => {:dependent => :restrict}
   end
 
 By default, t.references will not generate a foreign key.

data/lib/foreigner/connection_adapters/mysql_adapter.rb

@@ -30,11 +30,11 @@ module Foreigner
         fk_info.map do |row|
           options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
 
-          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
+          if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .* ON DELETE (CASCADE|SET NULL|RESTRICT)/
+            options[:dependent] = case $1
+              when 'CASCADE'  then :delete
+              when 'SET NULL' then :nullify
+              when 'RESTRICT' then :restrict
             end
           end
           ForeignKeyDefinition.new(table_name, row['to_table'], options)

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -35,11 +35,12 @@ module Foreigner
         fk_info.map do |row|
           options = {:column => row['column'], :name => row['name'], :primary_key => row['primary_key']}
 
-          if row['dependency'] == 'CASCADE'
-            options[:dependent] = :delete
-          elsif row['dependency'] == 'SET NULL'
-            options[:dependent] = :nullify
+          options[:dependent] = case row['dependency']
+            when 'CASCADE'  then :delete
+            when 'SET NULL' then :nullify
+            when 'RESTRICT' then :restrict
           end
+
           ForeignKeyDefinition.new(table_name, row['to_table'], options)
         end
       end

data/lib/foreigner/connection_adapters/sql_2003.rb

@@ -34,6 +34,7 @@ module Foreigner
           case dependency
             when :nullify then "ON DELETE SET NULL"
             when :delete  then "ON DELETE CASCADE"
+            when :restrict then "ON DELETE RESTRICT"
             else ""
           end
         end

data/test/mysql_adapter_test.rb

@@ -47,6 +47,14 @@ class MysqlAdapterTest < ActiveRecord::TestCase
     )
   end
   
+  def test_add_with_restrict_dependency
+    assert_equal(
+      "ALTER TABLE `employees` ADD CONSTRAINT `employees_company_id_fk` FOREIGN KEY (`company_id`) REFERENCES `companies`(id) " +
+      "ON DELETE RESTRICT",
+      add_foreign_key(:employees, :companies, :dependent => :restrict)
+    )
+  end
+  
   def test_remove_by_table
     assert_equal(
       "ALTER TABLE `suppliers` DROP FOREIGN KEY `suppliers_company_id_fk`",

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: matthuhiggins-foreigner
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -07:00
+date: 2010-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
       segments: 
       - 1
       - 8
@@ -63,6 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
       segments: 
       - 1
       - 3