From c8d66805dbd6cf6b2c780675318b7324799ea657 Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Tue, 5 Jul 2011 12:46:24 +0200
Subject: Only generate query statement names if queries are being generated

---
 odb/relational/pgsql/header.cxx | 14 ++++++++------
 odb/relational/pgsql/source.cxx | 21 +++++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/odb/relational/pgsql/header.cxx b/odb/relational/pgsql/header.cxx
index 85b9030..e8207aa 100644
--- a/odb/relational/pgsql/header.cxx
+++ b/odb/relational/pgsql/header.cxx
@@ -31,8 +31,14 @@ namespace relational
           os << "static const char* const persist_statement_name;"
              << "static const char* const find_statement_name;"
              << "static const char* const update_statement_name;"
-             << "static const char* const erase_statement_name;"
-             << endl;
+             << "static const char* const erase_statement_name;";
+
+          // Query statement name.
+          //
+          if (options.generate_query ())
+            os << "static const char* const query_statement_name;";
+
+          os << endl;
 
           // Statement types.
           //
@@ -42,10 +48,6 @@ namespace relational
              << "static const unsigned int erase_statement_types[];"
              << endl;
 
-          // Query statement name.
-          //
-          os << "static const char* const query_statement_name;"
-             << endl;
         }
       };
       entry<class_> class_entry_;
diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx
index f123591..b1fe16d 100644
--- a/odb/relational/pgsql/source.cxx
+++ b/odb/relational/pgsql/source.cxx
@@ -863,6 +863,15 @@ namespace relational
              << "erase_statement_name = " << strlit (fn + "_erase") << ";"
              << endl;
 
+          // Query statement name.
+          //
+          if (options.generate_query ())
+          {
+            os << name_decl << endl
+               << "query_statement_name = " << strlit (fn + "_query") << ";"
+               << endl;
+          }
+
           // Statement types.
           //
           string oid_decl ("const unsigned int " + traits);
@@ -920,12 +929,6 @@ namespace relational
 
             os << "};";
           }
-
-          // Query statement name.
-          //
-          os << name_decl << endl
-             << "query_statement_name = " << strlit (fn + "_query") << ";"
-             << endl;
         }
 
         virtual void
@@ -999,7 +1002,8 @@ namespace relational
           //
           {
             os << type_decl << endl
-               << "select_all_types[] ={";
+               << "select_all_types[] ="
+               << "{";
 
             if (inv)
             {
@@ -1025,7 +1029,8 @@ namespace relational
           //
           {
             os << type_decl << endl
-               << "insert_one_types[] ={";
+               << "insert_one_types[] ="
+               << "{";
 
             if (!inv)
             {
-- 
cgit v1.1