Add wrapper support for containers

1 files changed, 6 insertions, 5 deletions

diff --git a/odb/relational/pgsql/common.cxx b/odb/relational/pgsql/common.cxx
index d6ef9c3..e4d97cc 100644
--- a/odb/relational/pgsql/common.cxx
+++ b/odb/relational/pgsql/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);