From 64d0ceffaaf5f57a3d24a5210bf0ad2a8474a618 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 26 Aug 2011 12:13:18 +0200 Subject: Add wrapper support for composite values NULL semantics for composite values is not yet supported. --- odb/relational/pgsql/common.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'odb/relational/pgsql/common.cxx') diff --git a/odb/relational/pgsql/common.cxx b/odb/relational/pgsql/common.cxx index c5e3c9f..d6ef9c3 100644 --- a/odb/relational/pgsql/common.cxx +++ b/odb/relational/pgsql/common.cxx @@ -35,9 +35,13 @@ namespace relational semantics::type& t (type_override_ != 0 ? *type_override_ : m.type ()); - if (comp_value (t)) + if (semantics::class_* comp = comp_value_wrapper (t)) { - member_info mi (m, t, var, fq_type_override_); + // 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_); if (pre (mi)) { traverse_composite (mi); @@ -46,7 +50,7 @@ namespace relational } else if (container (t)) { - member_info mi (m, t, var, fq_type_override_); + member_info mi (m, t, 0, var, fq_type_override_); if (pre (mi)) { traverse_container (mi); @@ -59,7 +63,8 @@ namespace relational if (semantics::class_* c = object_pointer (t)) { - member_info mi (m, id_member (*c)->type (), var, fq_type_override_); + member_info mi ( + m, id_member (*c)->type (), 0, var, fq_type_override_); mi.st = &st; if (pre (mi)) { @@ -69,7 +74,7 @@ namespace relational } else { - member_info mi (m, t, var, fq_type_override_); + member_info mi (m, t, 0, var, fq_type_override_); mi.st = &st; if (pre (mi)) { -- cgit v1.1