[dm-constraints] renaming :nullify to :set_nil

Signed-off-by: Balint Erdi <balint.erdi@gmail.com>
lancecarlson · Jan 15, 2009 · afed67b · afed67b
1 parent ed770e1
commit afed67b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/dm-constraints/lib/dm-constraints.rb b/dm-constraints/lib/dm-constraints.rb
@@ -54,7 +54,7 @@ def initialize(name, repository_name, child_model, parent_model, options = {})
 
 module DataMapper
   module Associations
-    DELETE_CONSTRAINT_OPTIONS = [:protect, :destroy, :destroy!, :nullify, :skip]
+    DELETE_CONSTRAINT_OPTIONS = [:protect, :destroy, :destroy!, :set_nil, :skip]
     def has(cardinality, name, options = {})
 
       # NOTE: the reason for this fix is that with the ability to pass in two

diff --git a/dm-constraints/lib/dm-constraints/data_objects_adapter.rb b/dm-constraints/lib/dm-constraints/data_objects_adapter.rb
@@ -19,7 +19,7 @@ def create_constraints_statements(repository_name, model)
               "NO ACTION"
             when :destroy, :destroy!
               "CASCADE"
-            when :nullify
+            when :set_nil
               "SET NULL"
             when :skip
               nil
@@ -40,8 +40,6 @@ def destroy_constraints_statements(repository_name, model)
 
         private
 
-        #TODO: ON (DELETE|UPDATE) CASCADE must be given for the 'destroy' case
-        # ON (DELETE|UPDATE) SET NULL must be given for the 'nullify' case
         def create_constraints_statement(table_name, constraint_name, keys, foreign_table, foreign_keys, delete_constraint_type)
           <<-EOS.compress_lines
             ALTER TABLE #{quote_table_name(table_name)}

diff --git a/dm-constraints/lib/dm-constraints/delete_constraint.rb b/dm-constraints/lib/dm-constraints/delete_constraint.rb
@@ -12,7 +12,7 @@ def check_delete_constraints
             if children && children.respond_to?(:each)
               children.each { |child| child.destroy }
             end
-          when :nullify
+          when :set_nil
             if children && children.respond_to?(:each)
               children.each do |child|
                 child.class.many_to_one_relationships.each do |mto_rel|

diff --git a/dm-constraints/spec/integration/constraints_spec.rb b/dm-constraints/spec/integration/constraints_spec.rb
@@ -71,7 +71,7 @@ class Cow
     # :protect | raises exception if there are child records
     # :destroy | deletes children
     # :destroy! | deletes children directly without instantiating the resource, bypassing any hooks
-    # :nullify | sets parent id to nil in child associations
+    # :set_nil | sets parent id to nil in child associations
     # :skip | does not do anything with children (they'll become orphan records)
 
     describe "constraint options" do
@@ -157,10 +157,10 @@ class Cow
 
       end
 
-      describe "when :constraint => :nullify is given" do
+      describe "when :constraint => :set_nil is given" do
         before do
           class Farmer
-            has n, :cows, :constraint => :nullify
+            has n, :cows, :constraint => :set_nil
           end
           class Cow
             belongs_to :farmer