aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-07-05 12:46:24 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-07-05 14:43:38 +0200
commitc8d66805dbd6cf6b2c780675318b7324799ea657 (patch)
tree75e6625d8e50e6cd0f3acb76fae62d6b7203292f
parent87abcad59a90a9a9ce8809cdf51bea7fc5901baf (diff)
Only generate query statement names if queries are being generated
-rw-r--r--odb/relational/pgsql/header.cxx14
-rw-r--r--odb/relational/pgsql/source.cxx21
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)
{