diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-22 12:28:04 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-02-22 12:28:04 +0200 |
| commit | ae434e2dcc4d86063601a46c96c6ccf9ac267bad (patch) | |
| tree | eeaa3b621a73af098a67cfa0ad8caa0b5fe0bd12 | |
| parent | 3c62b4b218aedfe66cef51ce68c48b8e7e823328 (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/mssql/object-result.txx | 4 | ||||
| -rw-r--r-- | odb/mssql/object-statements.txx | 2 | ||||
| -rw-r--r-- | odb/mssql/view-result.txx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/odb/mssql/object-result.txx b/odb/mssql/object-result.txx index f368f04..efaeae9 100644 --- a/odb/mssql/object-result.txx +++ b/odb/mssql/object-result.txx @@ -64,7 +64,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 // long data also comes from the copy. @@ -213,7 +213,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 // long data also comes from the copy. diff --git a/odb/mssql/object-statements.txx b/odb/mssql/object-statements.txx index 5aac92b..c8753d2 100644 --- a/odb/mssql/object-statements.txx +++ b/odb/mssql/object-statements.txx @@ -93,7 +93,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 (); find_->free_result (); // Our find_() version delays result freeing. object_traits::load_ (*this, *l.obj); // Load containers, etc. diff --git a/odb/mssql/view-result.txx b/odb/mssql/view-result.txx index 0d16241..de64438 100644 --- a/odb/mssql/view-result.txx +++ b/odb/mssql/view-result.txx @@ -53,7 +53,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 // long data also comes from the copy. |