diff options
Diffstat (limited to 'odb/relational/sqlite/source.cxx')
-rw-r--r-- | odb/relational/sqlite/source.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/odb/relational/sqlite/source.cxx b/odb/relational/sqlite/source.cxx index 92c0941..0516370 100644 --- a/odb/relational/sqlite/source.cxx +++ b/odb/relational/sqlite/source.cxx @@ -337,7 +337,7 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - semantics::type& mt (member_type (mi.m, key_prefix_)); + semantics::type& mt (member_utype (mi.m, key_prefix_)); if (semantics::class_* c = object_pointer (mt)) { @@ -410,7 +410,7 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - if (object_pointer (member_type (mi.m, key_prefix_))) + if (object_pointer (member_utype (mi.m, key_prefix_))) { os << "}"; @@ -502,6 +502,10 @@ namespace relational string const& name (mi.m.name ()); member = "o." + name; + if (mi.cq) + member = "const_cast< " + mi.fq_type (false) + "& > (" + + member + ")"; + os << "// " << name << endl << "//" << endl; } @@ -515,7 +519,7 @@ namespace relational // Here we need the wrapper type, not the wrapped type. // member = "wrapper_traits< " + mi.fq_type (false) + " >::" + - "set_ref (" + member + ")"; + "set_ref (\n" + member + ")"; } if (composite (mi.t)) @@ -525,7 +529,7 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - semantics::type& mt (member_type (mi.m, key_prefix_)); + semantics::type& mt (member_utype (mi.m, key_prefix_)); if (semantics::class_* c = object_pointer (mt)) { @@ -576,13 +580,20 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - semantics::type& mt (member_type (mi.m, key_prefix_)); + semantics::type& mt (member_utype (mi.m, key_prefix_)); if (object_pointer (mt)) { - member = member_override_.empty () - ? "o." + mi.m.name () - : member_override_; + if (!member_override_.empty ()) + member = member_override_; + else + { + member = "o." + mi.m.name (); + + if (mi.cq) + member = "const_cast< " + mi.fq_type (false) + "& > (" + + member + ")"; + } if (lazy_pointer (mt)) os << member << " = ptr_traits::pointer_type (db, id);"; |