Skip to content

Commit

Permalink
fix bug in case the partial resolution of an object changes some prop…
Browse files Browse the repository at this point in the history
…erties
  • Loading branch information
James McKinney committed Nov 25, 2013
1 parent 18ceba1 commit c585761
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/pupa/processor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ def import
object = objects[id]
resolve_foreign_keys(object, object_id_to_database_id)
# The dependency graph strategy only works if there are no foreign objects.
object_id_to_database_id[id] = import_object(object)

database_id = import_object(object)
object_id_to_database_id[id] = database_id
object_id_to_database_id[database_id] = database_id
end
else
size = objects.size
Expand All @@ -170,8 +173,11 @@ def import
begin
resolve_foreign_keys(object, object_id_to_database_id)
resolve_foreign_objects(object, object_id_to_database_id)
object_id_to_database_id[id] = import_object(object)
progress_made = true

database_id = import_object(object)
object_id_to_database_id[id] = database_id
object_id_to_database_id[database_id] = database_id
rescue Pupa::Errors::MissingDatabaseIdError
false
end
Expand Down

0 comments on commit c585761

Please sign in to comment.