Implement support for database schema

New pragma qualifier: namespace. New pragma specifier: schema. The table
specifier was extended to accept a schema prefix. New option: --default-
schema. The common/schema test was extended to cover the new functionality.

1 files changed, 7 insertions, 7 deletions

diff --git a/odb/relational/model.cxx b/odb/relational/model.cxx
index 9bb6070..7c66387 100644
--- a/odb/relational/model.cxx
+++ b/odb/relational/model.cxx
@@ -144,17 +144,17 @@ namespace relational
       }
       catch (sema_rel::duplicate_name const& e)
       {
-        semantics::node& n (*e.nameable.get<semantics::node*> ("cxx-node"));
-        semantics::node& d (*e.duplicate.get<semantics::node*> ("cxx-node"));
+        semantics::node& o (*e.orig.get<semantics::node*> ("cxx-node"));
+        semantics::node& d (*e.dup.get<semantics::node*> ("cxx-node"));
 
         cerr << d.file () << ":" << d.line () << ":" << d.column ()
-             << ": error: " << e.duplicate.kind () << " name '"
-             << e.nameable.name () << "' conflicts with an already defined "
-             << e.nameable.kind () << " name"
+             << ": error: " << e.dup.kind () << " name '" << e.orig_name
+             << "' conflicts with an already defined " << e.orig.kind ()
+             << " name"
              << endl;
 
-        cerr << n.file () << ":" << n.line () << ":" << n.column ()
-             << ": info: conflicting " << e.nameable.kind () << " is "
+        cerr << o.file () << ":" << o.line () << ":" << o.column ()
+             << ": info: conflicting " << e.orig.kind () << " is "
              << "defined here"
              << endl;