From af12ffe836de09ec84f666effa4df347eeb07a43 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 26 Jan 2012 12:43:16 +0200
Subject: 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.
---
 odb/semantics/relational/key.hxx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'odb/semantics/relational/key.hxx')

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_;
     };
-- 
cgit v1.1