aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-09-10 14:04:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-09-10 14:04:38 +0200
commit9138a72ea602a88137fe1eb7e62922b89dc9e754 (patch)
tree1c7e9749e8e4e43d2e9f35f4d137b4dbe67fdf67
parent485ae35a88fe2500574797d7342cfa7585e9e191 (diff)
Cosmetic/consistency fixes
-rw-r--r--odb/pgsql/container-statements.hxx4
-rw-r--r--odb/pgsql/database.cxx4
-rw-r--r--odb/pgsql/no-id-object-result.hxx1
-rw-r--r--odb/pgsql/polymorphic-object-result.hxx1
-rw-r--r--odb/pgsql/polymorphic-object-statements.txx1
-rw-r--r--odb/pgsql/statement-cache.txx2
-rw-r--r--odb/pgsql/statement.cxx4
7 files changed, 12 insertions, 5 deletions
diff --git a/odb/pgsql/container-statements.hxx b/odb/pgsql/container-statements.hxx
index 3dcecf2..0bd222d 100644
--- a/odb/pgsql/container-statements.hxx
+++ b/odb/pgsql/container-statements.hxx
@@ -62,7 +62,7 @@ namespace odb
return functions_;
}
- //
+ // Schema version.
//
const schema_version_migration&
version_migration () const {return *svm_;}
@@ -328,7 +328,7 @@ namespace odb
this->conn_,
update_name_,
update_text_,
- this->versioned_, // Process if versioned.
+ this->versioned_, // Process if versioned.
update_types_,
update_count_,
update_image_binding_,
diff --git a/odb/pgsql/database.cxx b/odb/pgsql/database.cxx
index 389422b..ba51058 100644
--- a/odb/pgsql/database.cxx
+++ b/odb/pgsql/database.cxx
@@ -289,8 +289,8 @@ namespace odb
select_statement st (c,
"odb_database_schema_version",
text.c_str (),
- false,
- false,
+ false, // Don't process.
+ false, // Don't optimize.
param_types,
1,
param,
diff --git a/odb/pgsql/no-id-object-result.hxx b/odb/pgsql/no-id-object-result.hxx
index 1fbdf75..100e373 100644
--- a/odb/pgsql/no-id-object-result.hxx
+++ b/odb/pgsql/no-id-object-result.hxx
@@ -9,6 +9,7 @@
#include <cstddef> // std::size_t
+#include <odb/schema-version.hxx>
#include <odb/no-id-object-result.hxx>
#include <odb/details/shared-ptr.hxx>
diff --git a/odb/pgsql/polymorphic-object-result.hxx b/odb/pgsql/polymorphic-object-result.hxx
index db40e2e..9933fd2 100644
--- a/odb/pgsql/polymorphic-object-result.hxx
+++ b/odb/pgsql/polymorphic-object-result.hxx
@@ -9,6 +9,7 @@
#include <cstddef> // std::size_t
+#include <odb/schema-version.hxx>
#include <odb/polymorphic-object-result.hxx>
#include <odb/details/shared-ptr.hxx>
diff --git a/odb/pgsql/polymorphic-object-statements.txx b/odb/pgsql/polymorphic-object-statements.txx
index f6b223b..0d491bb 100644
--- a/odb/pgsql/polymorphic-object-statements.txx
+++ b/odb/pgsql/polymorphic-object-statements.txx
@@ -10,6 +10,7 @@
#include <odb/pgsql/connection.hxx>
#include <odb/pgsql/transaction.hxx>
#include <odb/pgsql/statement-cache.hxx>
+#include <odb/pgsql/traits-calls.hxx>
namespace odb
{
diff --git a/odb/pgsql/statement-cache.txx b/odb/pgsql/statement-cache.txx
index 48bc9da..fe5789f 100644
--- a/odb/pgsql/statement-cache.txx
+++ b/odb/pgsql/statement-cache.txx
@@ -2,6 +2,8 @@
// copyright : Copyright (c) 2005-2013 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file
+#include <odb/pgsql/database.hxx>
+
namespace odb
{
namespace pgsql
diff --git a/odb/pgsql/statement.cxx b/odb/pgsql/statement.cxx
index eea3c39..094aa40 100644
--- a/odb/pgsql/statement.cxx
+++ b/odb/pgsql/statement.cxx
@@ -187,7 +187,9 @@ namespace odb
text_ = text_copy_.c_str ();
}
- if (empty ())
+ // Empty statement.
+ //
+ if (*text_ == '\0')
{
deallocated_ = true;
return;