diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-22 12:28:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-22 12:28:06 +0200 |
| commit | 57272f08d87ef76f04878a57d4e37dbc95ca877f (patch) | |
| tree | dfe493c1e4600321f4aa0e52f7897036d82dacea | |
| parent | 005355604e521119efa4bbb2f32216262a16c9d2 (diff) | |
Add support for composite object ids
New pragma id_type (member). New test: common/composite-id. The composite
example has also been updated.
| -rw-r--r-- | odb/oracle/object-result.txx | 4 | ||||
| -rw-r--r-- | odb/oracle/object-statements.txx | 2 | ||||
| -rw-r--r-- | odb/oracle/view-result.txx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/odb/oracle/object-result.txx b/odb/oracle/object-result.txx index aae63f6..19ac6fe 100644 --- a/odb/oracle/object-result.txx +++ b/odb/oracle/object-result.txx @@ -60,7 +60,7 @@ namespace odb typename object_traits::image_type& i ( use_copy_ ? *image_copy_ : statements_.image ()); - object_traits::init (obj, i, db); + object_traits::init (obj, i, &db); // If we are using a copy, make sure the callback information for // LOB data also comes from the copy. @@ -211,7 +211,7 @@ namespace odb object_traits::init (obj, use_copy_ ? *image_copy_ : statements_.image (), - db); + &db); // If we are using a copy, make sure the callback information for // LOB data also comes from the copy. diff --git a/odb/oracle/object-statements.txx b/odb/oracle/object-statements.txx index 4a9c5ea..65fcf46 100644 --- a/odb/oracle/object-statements.txx +++ b/odb/oracle/object-statements.txx @@ -94,7 +94,7 @@ namespace odb // 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::init (*l.obj, image (), &db); find_->stream_result (); object_traits::load_ (*this, *l.obj); // Load containers, etc. diff --git a/odb/oracle/view-result.txx b/odb/oracle/view-result.txx index 9cbd9dc..4f1d01e 100644 --- a/odb/oracle/view-result.txx +++ b/odb/oracle/view-result.txx @@ -49,7 +49,7 @@ namespace odb view_traits::init (view, use_copy_ ? *image_copy_ : statements_.image (), - db); + &db); // If we are using a copy, make sure the callback information for // LOB data also comes from the copy. |