Added database abstractions

[gnucomo.git] / src / include / database.h

diff --git a/src/include/database.h b/src/include/database.h
index 1d94e64..4532bfb 100644 (file)
--- a/src/include/database.h
+++ b/src/include/database.h
@@ -8,7 +8,7 @@
 ***********************
 **      FILE NAME      : database.h
 **      SYSTEM NAME    : 
-**      VERSION NUMBER : $Revision: 1.11 $
+**      VERSION NUMBER : $Revision: 1.12 $
 **
 **  DESCRIPTION      :  Classes to provide an abstract layer on the Gnucomo
 **                      database.
@@ -27,7 +27,10 @@
 
 /*****************************
    $Log: database.h,v $
-   Revision 1.11  2007-01-11 13:50:10  arjen
+   Revision 1.12  2011-03-24 10:21:43  arjen
+   Adjusted to new version of libpqxx.
+
+   Revision 1.11  2007/01/11 13:50:10  arjen
    Experimental start of database OO abstraction layer.
 
    Revision 1.10  2003/12/04 10:39:36  arjen
@@ -66,13 +69,15 @@
 
 *****************************/
 
-/* static const char *RCSID = "$Id: database.h,v 1.11 2007-01-11 13:50:10 arjen Exp $"; */
+/* static const char *RCSID = "$Id: database.h,v 1.12 2011-03-24 10:21:43 arjen Exp $"; */
 
-#include <pqxx/connection.h>
-#include <pqxx/transaction.h>
-#include <pqxx/result.h>
+#include <pqxx/connection>
+#include <pqxx/transaction>
+#include <pqxx/result>
 #include "gnucomo_config.h"
 
+#define DEBUG
+
 /*
 ///////////////////////////////////////////////////////////////////////////
 //  NAME           : gnucomo_database
@@ -92,10 +97,11 @@
 class gnucomo_database
 {
    gnucomo_config    *cfg;
-   pqxx::Connection  *dbconn;
-   pqxx::Transaction *dbxact;
+   pqxx::connection  *dbconn;
+   //pqxx::transaction<pqxx::serializable> *dbxact;
+   pqxx::work *dbxact;
 
-   pqxx::Result      last_result;
+   pqxx::result      last_result;
 
 public:
 
@@ -130,23 +136,31 @@ public:
 
    int Query(String qry)
    {
-
-      last_result = dbxact->Exec(qry);
+      try
+      {
+         last_result = dbxact->exec((char *)qry);
 #ifdef DEBUG
       std::cerr << "Query " << qry << " returned "
                 << last_result.size() << " tuples.\n";
 #endif
+      }
+      catch (const pqxx::pqxx_exception &e)
+      {
+         std::cerr << "Error in QUERY " << qry << ":\n";
+         std::cerr << e.base().what() << std::endl;
+      }
+
       return last_result.size();
    }
 
-   pqxx::Result Result()
+   pqxx::result Result()
    {
       return last_result;
    }
 
    //  The field value of a specific result.
 
-   String Field(pqxx::Result res, int tuple, const char *fieldname)
+   String Field(pqxx::result res, int tuple, const char *fieldname)
    {
       return String(res[tuple][fieldname].c_str());
    }
@@ -185,22 +199,34 @@ public:
 
 class database_entity
 {
-   const gnucomo_database  *db;
+   gnucomo_database  *db;
    String    table;
+   String    connected_table;
 
    bool fresh;       // Completely new, no tuple in the database
    bool changed;     // A database update is needed
    bool deleted;     // Tuple is to be deleted from the database
 
+protected:
+
+   std::map<String,String> fields;
+
 public:
 
-  database_entity(const gnucomo_database &gdb, const String tbl)
-  {
-     db = &gdb;
-     table = tbl;
+   database_entity(gnucomo_database &gdb, const String tbl)
+   {
+      db = &gdb;
+      table = tbl;
+
+      fresh = true;
+      changed = false;
+      deleted = false;
+   }
+
+   // contruct a new database entity from the result of another one
+   database_entity(database_entity *from, int row);
+
+   int find_one(String key);
+   int find_many(String tab, String where);
 
-     fresh = true;
-     changed = false;
-     deleted = false;
-  }
 };