From 5ebd62ec778bc8c9540e2379e764ac52c060adfc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 9 Apr 2013 10:03:32 +0200
Subject: Generate embedded schema in single function instead of one per object

---
 odb/generator.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'odb/generator.cxx')

diff --git a/odb/generator.cxx b/odb/generator.cxx
index 5c9e897..8f49368 100644
--- a/odb/generator.cxx
+++ b/odb/generator.cxx
@@ -683,6 +683,11 @@ generate (options const& ops,
         case database::sqlite:
           {
             relational::source::generate ();
+
+            if (gen_schema &&
+                ops.schema_format ()[db].count (schema_format::embedded))
+              relational::schema::generate_source ();
+
             break;
           }
         }
@@ -726,7 +731,10 @@ generate (options const& ops,
                     "// Begin prologue.\n//",
                     "//\n// End prologue.");
 
-      sch << "#include " << ctx->process_include_path (hxx_name) << endl
+      sch << "#include <odb/database.hxx>" << endl
+          << "#include <odb/schema-catalog-impl.hxx>" << endl
+          << endl
+          << "#include <odb/details/unused.hxx>" << endl
           << endl;
 
       {
@@ -742,7 +750,7 @@ generate (options const& ops,
         case database::pgsql:
         case database::sqlite:
           {
-            relational::schema_source::generate ();
+            relational::schema::generate_source ();
             break;
           }
         case database::common:
-- 
cgit v1.1