diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-18 11:38:40 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-18 11:38:40 +0200 |
commit | 35c3d273bbf1bd8c9c41ac1c3d91f150df0eb280 (patch) | |
tree | 7ff18feae934977f4c56a650f29018943686ed63 /odb/sqlite/object-statements.txx | |
parent | 821721c0d4fa9d6246a665b6d585c1574ed4c80f (diff) |
Fix custom recursive loading in post_load callback
Before we called the callback while holding the statements locked. As a
result, if the callback tried to load another object of this type, it
failed. Now we unlock the statements (since we have completely loaded
the object from ODB's point of view) and then call the callback. The
callback test has been updated to test this situation.
Diffstat (limited to 'odb/sqlite/object-statements.txx')
-rw-r--r-- | odb/sqlite/object-statements.txx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/odb/sqlite/object-statements.txx b/odb/sqlite/object-statements.txx index 0ae9886..9cd8344 100644 --- a/odb/sqlite/object-statements.txx +++ b/odb/sqlite/object-statements.txx @@ -70,7 +70,18 @@ namespace odb if (!delayed_.empty ()) load_delayed_ (); - object_traits::callback (db, *l.obj, callback_event::post_load); + // Temporarily unlock the statement for the post_load call so that + // it can load objects of this type recursively. This is safe to do + // because we have completely loaded the current object. Also the + // delayed_ list is clear before the unlock and should be clear on + // re-lock (since a callback can only call public API functions + // which will make sure all the delayed loads are processed before + // returning). + // + { + auto_unlock u (*this); + object_traits::callback (db, *l.obj, callback_event::post_load); + } g.release (); } |