From 4eceea6c547240df49697f9d22ccaf4e9101b915 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 4 Jul 2011 17:53:47 +0200 Subject: Implement support for database operations callbacks New object pragma: callback. New test: common/callback. New manual section: 10.1.4, "callback". --- odb/sqlite/object-statements.txx | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'odb/sqlite/object-statements.txx') diff --git a/odb/sqlite/object-statements.txx b/odb/sqlite/object-statements.txx index 53a157f..0ae9886 100644 --- a/odb/sqlite/object-statements.txx +++ b/odb/sqlite/object-statements.txx @@ -7,6 +7,7 @@ #include // std::memset #include +#include #include #include @@ -43,22 +44,34 @@ namespace odb void object_statements:: load_delayed_ () { - // We should be careful here: the delayed vector can change - // from under us as a result of a recursive load. - // database& db (connection ().database ()); - while (!delayed_.empty ()) + delayed_loads dls; + swap_guard sg (*this, dls); + + while (!dls.empty ()) { - delayed_load l (delayed_.back ()); + delayed_load l (dls.back ()); typename object_cache_traits::insert_guard g (l.pos); - delayed_.pop_back (); + dls.pop_back (); if (!object_traits::find_ (*this, l.id)) throw object_not_persistent (); + object_traits::callback (db, *l.obj, callback_event::pre_load); + + // Our calls to init/load below can result in additional delayed + // loads being added to the delayed_ vector. We need to process + // those before we call the post callback. + // object_traits::init (*l.obj, image (), db); object_traits::load_ (*this, *l.obj); // Load containers, etc. + + if (!delayed_.empty ()) + load_delayed_ (); + + object_traits::callback (db, *l.obj, callback_event::post_load); + g.release (); } } -- cgit v1.1