diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-26 12:43:16 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-26 12:43:16 +0200 |
| commit | af12ffe836de09ec84f666effa4df347eeb07a43 (patch) | |
| tree | dc0aec9f8fee545c84be098414772cf2b277c30d /odb/relational/processor.cxx | |
| parent | c1d2ec5bbd5969332f3278f39d2a7a8f0abc0493 (diff) | |
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.
Diffstat (limited to 'odb/relational/processor.cxx')
| -rw-r--r-- | odb/relational/processor.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odb/relational/processor.cxx b/odb/relational/processor.cxx index 8d80df0..da817b2 100644 --- a/odb/relational/processor.cxx +++ b/odb/relational/processor.cxx @@ -1431,7 +1431,7 @@ namespace relational ep.kind = column_expr_part::reference; ep.table = am.vo->alias.empty () ? table_name (*am.vo->obj) - : am.vo->alias; + : qname (am.vo->alias); ep.member_path.push_back (am.m); src_m = am.m; @@ -1745,12 +1745,12 @@ namespace relational else obj_count++; - tree n (TYPE_MAIN_VARIANT (i->node)); + tree n (TYPE_MAIN_VARIANT (i->obj_node)); if (TREE_CODE (n) != RECORD_TYPE) { error (i->loc) - << "name '" << i->orig_name << "' in db pragma object does " + << "name '" << i->obj_name << "' in db pragma object does " << "not name a class" << endl; throw operation_failed (); @@ -1761,11 +1761,11 @@ namespace relational if (!object (o)) { error (i->loc) - << "name '" << i->orig_name << "' in db pragma object does " + << "name '" << i->obj_name << "' in db pragma object does " << "not name a persistent class" << endl; info (o.file (), o.line (), o.column ()) - << "class '" << i->orig_name << "' is defined here" << endl; + << "class '" << i->obj_name << "' is defined here" << endl; throw operation_failed (); } @@ -1777,7 +1777,7 @@ namespace relational if (!omap.insert (view_object_map::value_type (n, &*i)).second) { error (i->loc) - << "persistent class '" << i->orig_name << "' is used in " + << "persistent class '" << i->obj_name << "' is used in " << "the view more than once" << endl; info (i->loc) |