summaryrefslogtreecommitdiff
path: root/odb/semantics/relational/key.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-01-26 12:43:16 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-01-26 12:43:16 +0200
commitaf12ffe836de09ec84f666effa4df347eeb07a43 (patch)
treedc0aec9f8fee545c84be098414772cf2b277c30d /odb/semantics/relational/key.hxx
parentc1d2ec5bbd5969332f3278f39d2a7a8f0abc0493 (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/semantics/relational/key.hxx')
-rw-r--r--odb/semantics/relational/key.hxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/odb/semantics/relational/key.hxx b/odb/semantics/relational/key.hxx
index 7e7a847..f714876 100644
--- a/odb/semantics/relational/key.hxx
+++ b/odb/semantics/relational/key.hxx
@@ -7,13 +7,13 @@
#define ODB_SEMANTICS_RELATIONAL_KEY_HXX
#include <odb/semantics/relational/elements.hxx>
-#include <odb/semantics/relational/column.hxx>
namespace semantics
{
namespace relational
{
class key;
+ class column;
class contains: public edge
{
@@ -51,7 +51,7 @@ namespace semantics
column_type* column_;
};
- class key: public nameable
+ class key: public virtual node
{
typedef std::vector<contains*> contains_list;
@@ -85,12 +85,6 @@ namespace semantics
contains_.push_back (&e);
}
- protected:
- key (string const& id)
- : nameable (id)
- {
- }
-
private:
contains_list contains_;
};