diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-03 18:23:51 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-03 18:23:51 +0200 |
commit | 80b868be1e7c249daa714b0c7a5f87694edb8664 (patch) | |
tree | d8e0dd6eca09d33d70224f7289ae096a0976cd6b /odb/relational/processor.cxx | |
parent | 89ba09f073b103953c53e63bd78f644973d9154e (diff) |
Implement nested id support
Now the 'id' specifier can optionally include the data member path
to the id inside the composite value. For example:
#pragma db id(first)
std::pair<int, int> p;
Note that one somewhat counter-intuitive aspect of this new feature
is that the whole member marked with id ('p' in the above example)
and not just the actual id member ('p.first' in the above example)
is treated as readonly.
Such nested id also cannot be automatically assigned (auto specifier).
Diffstat (limited to 'odb/relational/processor.cxx')
-rw-r--r-- | odb/relational/processor.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odb/relational/processor.cxx b/odb/relational/processor.cxx index 2979a34..48ddba4 100644 --- a/odb/relational/processor.cxx +++ b/odb/relational/processor.cxx @@ -27,8 +27,8 @@ namespace relational id_column_type () { context& c (context::current ()); - semantics::data_member& id (*context::id_member (*c.top_object)); - return id.get<string> ("column-type"); + data_member_path& id (*context::id_member (*c.top_object)); + return id.back ()->get<string> ("column-id-type"); } struct data_member: traversal::data_member, context @@ -85,7 +85,7 @@ namespace relational // This is an object pointer. The column type is the pointed-to // object id type. // - semantics::data_member& id (*id_member (*c)); + semantics::data_member& id (*id_member (*c)->back ()); semantics::names* idhint; semantics::type& idt (utype (id, idhint)); @@ -220,7 +220,7 @@ namespace relational // { semantics::class_& r (*object_pointer (t)); - semantics::data_member& id (*id_member (r)); + semantics::data_member& id (*id_member (r)->front ()); if (id.count ("column")) m.set ("column", id.get<table_column> ("column")); @@ -306,7 +306,7 @@ namespace relational // This is an object pointer. The column type is the pointed-to // object id type. // - semantics::data_member& id (*id_member (*c)); + semantics::data_member& id (*id_member (*c)->back ()); semantics::names* idhint; semantics::type& idt (utype (id, idhint)); @@ -824,7 +824,7 @@ namespace relational m.set ("column-type", src_m->get<string> ("column-type")); else if (semantics::class_* c = object_pointer (utype (*src_m))) { - semantics::data_member& id (*id_member (*c)); + semantics::data_member& id (*id_member (*c)->back ()); if (id.count ("type")) m.set ("column-type", id.get<string> ("column-type")); |