From 5e17d609ae59dc07514e2af945db05be05db968c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 13 Aug 2010 15:34:58 +0200
Subject: Do not generate query support code by default

Add the --generate-query option to explicitly request this functionality.
---
 odb/mysql/header.cxx | 64 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 25 deletions(-)

(limited to 'odb/mysql/header.cxx')

diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index 0d3e3f7..bbf12bb 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -288,22 +288,27 @@ namespace mysql
         //
         id_image_type_.traverse (c);
 
-        // query_base_type
+        // query_type & query_base_type
         //
-        os << "typedef mysql::query query_base_type;"
-           << endl;
+        if (options.generate_query ())
+        {
+          // query_base_type
+          //
+          os << "typedef mysql::query query_base_type;"
+             << endl;
 
-        // query_type
-        //
-        os << "struct query_type: query_base_type"
-           << "{";
+          // query_type
+          //
+          os << "struct query_type: query_base_type"
+             << "{";
 
-        names (c, query_column_names_);
+          names (c, query_column_names_);
 
-        os << "query_type ();"
-           << "query_type (const std::string&);"
-           << "query_type (const query_base_type&);"
-           << "};";
+          os << "query_type ();"
+             << "query_type (const std::string&);"
+             << "query_type (const query_base_type&);"
+             << "};";
+        }
 
         // id_source
         //
@@ -321,9 +326,12 @@ namespace mysql
         os << "static const char* const insert_query;"
            << "static const char* const select_query;"
            << "static const char* const update_query;"
-           << "static const char* const delete_query;"
-           << "static const char* const select_prefix;"
-           << endl;
+           << "static const char* const delete_query;";
+
+        if (options.generate_query ())
+          os << "static const char* const select_prefix;";
+
+        os << endl;
 
         // id ()
         //
@@ -391,9 +399,10 @@ namespace mysql
 
         // query ()
         //
-        os << "static result<object_type>" << endl
-           << "query (database&, const query_type&);"
-           << endl;
+        if (options.generate_query ())
+          os << "static result<object_type>" << endl
+             << "query (database&, const query_type&);"
+             << endl;
 
         // Helpers.
         //
@@ -439,14 +448,19 @@ namespace mysql
 
     ctx.os << "#include <odb/core.hxx>" << endl
            << "#include <odb/traits.hxx>" << endl
-           << "#include <odb/buffer.hxx>" << endl
-           << "#include <odb/shared-ptr.hxx>" << endl
-           << "#include <odb/result.hxx>" << endl
-           << endl
+           << "#include <odb/buffer.hxx>" << endl;
+
+    if (ctx.options.generate_query ())
+      ctx.os << "#include <odb/result.hxx>" << endl;
+
+    ctx.os << endl
            << "#include <odb/mysql/version.hxx>" << endl
-           << "#include <odb/mysql/forward.hxx>" << endl
-           << "#include <odb/mysql/query.hxx>" << endl
-           << endl;
+           << "#include <odb/mysql/forward.hxx>" << endl;
+
+    if (ctx.options.generate_query ())
+      ctx.os << "#include <odb/mysql/query.hxx>" << endl;
+
+    ctx.os << endl;
 
     ctx.os << "namespace odb"
            << "{";
-- 
cgit v1.1