Boolean correctness in migrations

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index 4becce89c44d41653b90443f83c643ca326207cb..6e214f90271a066b77a50873c19caddf6840cacd 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -7,7 +7,7 @@ module ConsistencyValidations
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
     if new.version != old.version
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
     if new.version != old.version

-      raise OSM::APIVersionMismatchError.new(new.version, old.version)
+      raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)

     elsif new.changeset.nil?
       raise OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id
     elsif new.changeset.nil?
       raise OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id


@@ -16,4 +16,15 @@ module ConsistencyValidations
       raise OSM::APIChangesetAlreadyClosedError.new
     end
   end
       raise OSM::APIChangesetAlreadyClosedError.new
     end
   end

+  
+  # This is similar to above, just some validations don't apply
+  def check_create_consistency(new, user)
+    if new.changeset.nil?
+      raise OSM::APIChangesetMissingError.new
+    elsif new.changeset.user_id != user.id
+      raise OSM::APIUserChangesetMismatchError.new
+    elsif not new.changeset.is_open?
+      raise OSM::APIChangesetAlreadyClosedError.new
+    end
+  end

 end
 end