immigrant 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed3d771b38d02c5ff03b07c83d14e820703fe43
-  data.tar.gz: 8408b58635d65127dfcb28125bc23ff701abb442
+  metadata.gz: 178034936e28a389c8a909243a9576c6212d8fb0
+  data.tar.gz: 881d1940852983b4a262e1904b7ccc9471233d25
 SHA512:
-  metadata.gz: d81e14ec77a85039b8cd6fb9ca64b3bb25730ee4b232a220c37c1285340993b808d3ec82a2d721172fc2a5647ee934bf007774d76d32105761cd3279b8d98098
-  data.tar.gz: 29faf9f62a44d17984fd685600e38220a1e3cc355127c98fb810c4e76b1609ec8068eda4380e05a8738b38505c54fd2ab5435e855eba193bd019b0a9a602d42e
+  metadata.gz: e59b3cd9d311554a884b871421e719082944ed0c6e891a8b28ddc8f20c8d09ac803a5afa708d7336fda28e141856276eb40034f21d43d0e0b00baa9df56c4f4e
+  data.tar.gz: 44a246c9e00744f3003a4c2d4481d3654129659a1f1dbd6c208b1d5d0d646d8ac100c3368da087d062e0703f4e6a3bf4a5048a6527ed36e2dad178c580619f14

data/lib/immigrant.rb

@@ -75,7 +75,7 @@ module Immigrant
           #    Foo.has_many :bars
           #    Foo.has_many :bazzes, :class_name => Bar
           # we need to make sure everything is legit and see if any of them
-          # specify :dependent => :delete
+          # specify :dependent => :delete|:delete_all|:nullify
           if current_key = foreign_keys[foreign_key.hash_key]
             if current_key.to_table != foreign_key.to_table || current_key.options[:primary_key] != foreign_key.options[:primary_key]
               warnings[foreign_key.hash_key] ||= "Skipping #{foreign_key.from_table}.#{foreign_key.options[:column]}: it has multiple associations referencing different keys/tables."
@@ -149,6 +149,12 @@ module Immigrant
         ]
       end
 
+      DEPENDENT_MAP = {
+        :delete => :cascade,
+        :delete_all => :cascade,
+        :nullify => :nullify
+      }
+
       def infer_has_n_keys(klass, reflection)
         from_table = reflection.klass.table_name
         to_table = klass.table_name
@@ -156,8 +162,9 @@ module Immigrant
         primary_key = (reflection.options[:primary_key] || klass.primary_key).to_s
 
         actions = {}
-        if [:delete, :delete_all].include?(reflection.options[:dependent]) && !qualified_reflection?(reflection, klass)
-          actions = {:on_delete => :cascade, :on_update => :cascade}
+        dependent_action = DEPENDENT_MAP[reflection.options[:dependent]]
+        if dependent_action && !qualified_reflection?(reflection, klass)
+          actions = {:on_delete => dependent_action, :on_update => dependent_action}
         end
 
         [

data/test/immigrant_test.rb

@@ -28,6 +28,18 @@ class ImmigrantTest < ActiveSupport::TestCase
         end
       })
     end
+    if ActiveRecord::VERSION::STRING < '4.1'
+      # make sure habtms create a model class so that MockConnection.tables works
+      extend(Module.new{
+        define_method :has_and_belongs_to_many do |assoc, options = {}|
+          join_table = options[:join_table] || [table_name, assoc.to_s].sort.join("_")
+          Class.new(ActiveRecord::Base) do
+            self.table_name = join_table
+          end
+          super assoc, options
+        end
+      })
+    end
   end
 
   class MockConnection
@@ -131,6 +143,23 @@ class ImmigrantTest < ActiveSupport::TestCase
     )
   end
 
+  test 'has_one :dependent => :nullify should generate a foreign key with :on_delete => :nullify' do
+    given <<-CODE
+      class Author < ActiveRecord::Base
+        has_one :book, :order => "id DESC", :dependent => :nullify
+      end
+      class Book < ActiveRecord::Base; end
+    CODE
+
+    assert_equal(
+      [foreign_key_definition(
+         'books', 'authors',
+         :column => 'author_id', :primary_key => 'id', :on_delete => :nullify, :on_update => :nullify
+       )],
+      infer_keys
+    )
+  end
+
   test 'has_many should generate a foreign key' do
     given <<-CODE
       class Author < ActiveRecord::Base
@@ -165,6 +194,23 @@ class ImmigrantTest < ActiveSupport::TestCase
     )
   end
 
+  test 'has_many :dependent => :nullify should generate a foreign key with :on_delete => :nullify' do
+    given <<-CODE
+      class Author < ActiveRecord::Base
+        has_many :books, :dependent => :nullify
+      end
+      class Book < ActiveRecord::Base; end
+    CODE
+
+    assert_equal(
+      [foreign_key_definition(
+         'books', 'authors',
+         :column => 'author_id', :primary_key => 'id', :on_delete => :nullify, :on_update => :nullify
+       )],
+      infer_keys
+    )
+  end
+
   test 'has_and_belongs_to_many should generate two foreign keys' do
     given <<-CODE
       class Author < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: immigrant
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord