diff options
Diffstat (limited to 'odb/relational/mysql')
| -rw-r--r-- | odb/relational/mysql/common.cxx | 11 | ||||
| -rw-r--r-- | odb/relational/mysql/common.hxx | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/odb/relational/mysql/common.cxx b/odb/relational/mysql/common.cxx index f9028d7..4599b87 100644 --- a/odb/relational/mysql/common.cxx +++ b/odb/relational/mysql/common.cxx @@ -35,22 +35,23 @@ namespace relational semantics::type& t (type_override_ != 0 ? *type_override_ : m.type ()); - if (semantics::class_* comp = comp_value_wrapper (t)) + if (semantics::class_* c = comp_value_wrapper (t)) { // If t is a wrapper, pass the wrapped type. Also pass the // original, wrapper type. // - member_info mi ( - m, *comp, (wrapper (t) ? &t : 0), var, fq_type_override_); + member_info mi (m, *c, (wrapper (t) ? &t : 0), var, fq_type_override_); if (pre (mi)) { traverse_composite (mi); post (mi); } } - else if (container (t)) + else if (semantics::type* c = container_wrapper (t)) { - member_info mi (m, t, 0, var, fq_type_override_); + // The same unwrapping logic as for composite values. + // + member_info mi (m, *c, (wrapper (t) ? &t : 0), var, fq_type_override_); if (pre (mi)) { traverse_container (mi); diff --git a/odb/relational/mysql/common.hxx b/odb/relational/mysql/common.hxx index 69ee515..a85a75e 100644 --- a/odb/relational/mysql/common.hxx +++ b/odb/relational/mysql/common.hxx @@ -40,10 +40,13 @@ namespace relational string fq_type (bool unwrap = true) const { - // At the moment a wrapped type can only be a composite value. - // if (wrapper != 0 && unwrap) - return t.fq_name (); + { + // Use the hint from the wrapper. + // + return t.fq_name ( + wrapper->get<semantics::names*> ("wrapper-hint")); + } // Use the original type from 'm' instead of 't' since the hint // may be invalid for a different type. Plus, if a type is |