1 files changed, 102 insertions, 7 deletions

diff --git a/odb/context.cxx b/odb/context.cxx
index e220d0e..13fc1b3 100644
--- a/odb/context.cxx
+++ b/odb/context.cxx
@@ -1472,7 +1472,7 @@ utype (semantics::data_member& m,
       }
     }
 
-    if (s->global_scope ())
+    if (!s->named_p () || s->global_scope ())
       break;
   }
 
@@ -1882,8 +1882,13 @@ schema (semantics::scope& s) const
 
     namespace_* ns (dynamic_cast<namespace_*> (ps));
 
-    if (ns == 0)
-      continue; // Some other scope.
+    if (ns == 0) // Some other scope.
+    {
+      if (!ps->named_p ())
+        break;
+
+      continue;
+    }
 
     if (ns->extension ())
       ns = &ns->original ();
@@ -1920,7 +1925,8 @@ schema (semantics::scope& s) const
       n.swap (r);
     }
 
-    if (r.fully_qualified () || ns->global_scope ())
+    if (r.fully_qualified () ||
+        ns->global_scope ()) // Note: namespaces always named.
       break;
   }
 
@@ -1952,8 +1958,13 @@ table_name_prefix (semantics::scope& s) const
 
     namespace_* ns (dynamic_cast<namespace_*> (ps));
 
-    if (ns == 0)
-      continue; // Some other scope.
+    if (ns == 0) // Some other scope.
+    {
+      if (!ps->named_p ())
+        break;
+
+      continue;
+    }
 
     if (ns->extension ())
       ns = &ns->original ();
@@ -1964,7 +1975,7 @@ table_name_prefix (semantics::scope& s) const
       r = n.uname () + r;
     }
 
-    if (ns->global_scope ())
+    if (ns->global_scope ()) // Note: namespaces always named.
       break;
   }
 
@@ -2130,6 +2141,90 @@ table_name (semantics::data_member& m, table_prefix const& p) const
   return r;
 }
 
+string context::
+table_options (semantics::class_& c)
+{
+  string r;
+
+  // Accumulate options from class.
+  //
+  // @@ Should we also get them from bases?
+  //
+  // @@ Note for some databases (like SQLite), options are seperated with
+  //    comma, not space. Likely the same issue in the column_options().
+  //
+  if (c.count ("options"))
+  {
+    strings const& o (c.get<strings> ("options"));
+
+    for (strings::const_iterator i (o.begin ()); i != o.end (); ++i)
+    {
+      if (i->empty ())
+        r.clear ();
+      else
+      {
+        if (!r.empty ())
+          r += ' ';
+
+        r += *i;
+      }
+    }
+  }
+
+  return r;
+}
+
+string context::
+table_options (semantics::data_member& m, semantics::type& c)
+{
+  string r;
+
+  // Accumulate options from container and member.
+  //
+  // @@ Currently there is no way to assign options to the container type. If
+  //    we use the value specifier, then it ends up being treated as a value
+  //    type. To support this we will probably need to invent the container
+  //    specifier.
+  //
+  if (c.count ("options"))
+  {
+    strings const& o (c.get<strings> ("options"));
+
+    for (strings::const_iterator i (o.begin ()); i != o.end (); ++i)
+    {
+      if (i->empty ())
+        r.clear ();
+      else
+      {
+        if (!r.empty ())
+          r += ' ';
+
+        r += *i;
+      }
+    }
+  }
+
+  if (m.count ("options"))
+  {
+    strings const& o (m.get<strings> ("options"));
+
+    for (strings::const_iterator i (o.begin ()); i != o.end (); ++i)
+    {
+      if (i->empty ())
+        r.clear ();
+      else
+      {
+        if (!r.empty ())
+          r += ' ';
+
+        r += *i;
+      }
+    }
+  }
+
+  return r;
+}
+
 // context::column_prefix
 //
 context::column_prefix::