Strip includes

src/cpp/database/SqliteDatabase.cpp

@@ -4,21 +4,37 @@
 */
 //==============================================================================
 
-#include "SqliteDatabase.h"
-#include "sqlite3.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <iostream>
-
-#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
-
 SETUP_LOG (SqliteDatabase)
 
 using namespace std;
 
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::~SqliteStatement ()
+{
+    sqlite3_finalize (statement);
+}
+
 SqliteDatabase::SqliteDatabase (const char* host) : Database (host, "", ""), mWalQ (NULL), walRunning (false)
 {
     mConnection     = NULL;
@@ -298,33 +314,6 @@ void SqliteDatabase::runWal ()
     }
 }
 
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::~SqliteStatement ()
-{
-    sqlite3_finalize (statement);
-}
-
 sqlite3_stmt* SqliteStatement::peekStatement ()
 {
     return statement;

src/cpp/database/SqliteDatabase.h

@@ -13,7 +13,7 @@ struct sqlite3_stmt;
 class SqliteDatabase : public Database
 {
 public:
-    SqliteDatabase (const char* host);
+    explicit SqliteDatabase (char const* host);
 
     void connect ();
     void disconnect ();
@@ -61,6 +61,7 @@ public:
 
 private:
     sqlite3* mConnection;
+    // VFALCO TODO Why do we need an "aux" connection? Should just use a second SqliteDatabase object.
     sqlite3* mAuxConnection;
     sqlite3_stmt* mCurrentStmt;
     bool mMoreRows;
@@ -80,6 +81,9 @@ protected:
     sqlite3_stmt* statement;
 
 public:
+    // VFALCO TODO This is quite a convoluted interface. A mysterious "aux" connection? 
+    //             Why not just have two SqliteDatabase objects?
+    //
     SqliteStatement (SqliteDatabase* db, const char* statement, bool aux = false);
     SqliteStatement (SqliteDatabase* db, const std::string& statement, bool aux = false);
     ~SqliteStatement ();

src/cpp/database/database.cpp

@@ -4,10 +4,6 @@
 */
 //==============================================================================
 
-#include "database.h"
-#include <stdlib.h>
-#include <string.h>
-
 Database::Database (const char* host, const char* user, const char* pass) : mNumCol (0)
 {
     mDBPass = pass;