diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-09-20 16:33:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-09-20 16:33:52 +0200 |
| commit | 06cace40d185254d17d74f4ae933dc86cc80d9bd (patch) | |
| tree | 486c3df0d803546a49be8431d7b71026f0fe28d8 | |
| parent | a91f7d4d0db038a4d055c9aa9a9baa1c406d0c7a (diff) | |
Rename query_clause to query_statement for consistency
| -rw-r--r-- | odb/relational/header.hxx | 4 | ||||
| -rw-r--r-- | odb/relational/pgsql/source.cxx | 4 | ||||
| -rw-r--r-- | odb/relational/source.hxx | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx index 51c95f9..e4933a0 100644 --- a/odb/relational/header.hxx +++ b/odb/relational/header.hxx @@ -1107,8 +1107,8 @@ namespace relational if (options.generate_query ()) { - os << "static const char query_clause[];" - << "static const char erase_query_clause[];" + os << "static const char query_statement[];" + << "static const char erase_query_statement[];" << endl << "static const char table_name[];"; } diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx index dbda7be..6c4a656 100644 --- a/odb/relational/pgsql/source.cxx +++ b/odb/relational/pgsql/source.cxx @@ -996,7 +996,7 @@ namespace relational { os << "sts.connection ()," << endl << "query_statement_name," << endl - << "query_clause + q.clause ()," << endl + << "query_statement + q.clause ()," << endl << "q.parameter_types ()," << endl << "q.parameter_count ()," << endl << "q.parameters_binding ()," << endl @@ -1008,7 +1008,7 @@ namespace relational { os << "conn," << endl << "erase_query_statement_name," << endl - << "erase_query_clause + q.clause ()," << endl + << "erase_query_statement + q.clause ()," << endl << "q.parameter_types ()," << endl << "q.parameter_count ()," << endl << "q.parameters_binding ()"; diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index c59af8f..92a406b 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -2063,7 +2063,7 @@ namespace relational object_query_statement_ctor_args (type&) { os << "sts.connection ()," << endl - << "query_clause + q.clause ()," << endl + << "query_statement + q.clause ()," << endl << "q.parameters_binding ()," << endl << "imb"; } @@ -2072,7 +2072,7 @@ namespace relational object_erase_query_statement_ctor_args (type&) { os << "conn," << endl - << "erase_query_clause + q.clause ()," << endl + << "erase_query_statement + q.clause ()," << endl << "q.parameters_binding ()"; } @@ -2345,13 +2345,13 @@ namespace relational if (options.generate_query ()) { - // query_clause + // query_statement // bool t (true); instance<object_joins> oj (c, t); //@@ (im)perfect forwarding oj->traverse (c); - os << "const char " << traits << "::query_clause[] =" << endl + os << "const char " << traits << "::query_statement[] =" << endl << strlit ("SELECT ") << endl; { @@ -2364,10 +2364,10 @@ namespace relational os << strlit (" ") << ";" << endl; - // erase_query_clause + // erase_query_statement // - os << "const char " << traits << "::erase_query_clause[] =" << endl - << strlit ("DELETE FROM " + table) << endl; + os << "const char " << traits << "::erase_query_statement[] =" << endl + << strlit ("DELETE FROM " + table) << endl; // DELETE JOIN: // |