From 7d3f2b0badf4298bca53936d22a0a22c74538713 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 6 Sep 2011 14:57:40 +0200
Subject: Allow select statement without parameters

---
 odb/sqlite/statement.cxx | 15 +++++++++++++--
 odb/sqlite/statement.hxx |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'odb/sqlite')

diff --git a/odb/sqlite/statement.cxx b/odb/sqlite/statement.cxx
index d0020d5..6417b3a 100644
--- a/odb/sqlite/statement.cxx
+++ b/odb/sqlite/statement.cxx
@@ -239,7 +239,15 @@ namespace odb
                       const string& s,
                       binding& cond,
                       binding& data)
-        : statement (conn, s), cond_ (cond), data_ (data)
+        : statement (conn, s), cond_ (&cond), data_ (data)
+    {
+    }
+
+    select_statement::
+    select_statement (connection& conn,
+                      const string& s,
+                      binding& data)
+        : statement (conn, s), cond_ (0), data_ (data)
     {
     }
 
@@ -250,7 +258,10 @@ namespace odb
         reset ();
 
       done_ = false;
-      bind_param (cond_.bind, cond_.count);
+
+      if (cond_ != 0)
+        bind_param (cond_->bind, cond_->count);
+
       active (true);
     }
 
diff --git a/odb/sqlite/statement.hxx b/odb/sqlite/statement.hxx
index 1d48cd4..69f5a95 100644
--- a/odb/sqlite/statement.hxx
+++ b/odb/sqlite/statement.hxx
@@ -216,6 +216,10 @@ namespace odb
                         binding& cond,
                         binding& data);
 
+      select_statement (connection& conn,
+                        const std::string& statement,
+                        binding& data);
+
       // Common select interface expected by the generated code.
       //
     public:
@@ -273,7 +277,7 @@ namespace odb
 
     private:
       bool done_;
-      binding& cond_;
+      binding* cond_;
       binding& data_;
     };
 
-- 
cgit v1.1