showimg/showimg-0.9.5+libpqxx-2.6.9.patch

   1 diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
   2 --- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp      2006-01-07 03:47:46.000000000 -0500
   3 +++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp   2008-07-20 14:30:44.000000000 -0400
   4 @@ -248,7 +248,7 @@
   5                 //        m_trans = new pqxx::nontransaction(*m_pqxxsql);
   6
   7          //Create a result object through the transaction
   8 -        m_res = new pqxx::result(m_trans->data->exec(statement.utf8()));
   9 +        m_res = new pqxx::result(m_trans->data->exec(statement.utf8().data()));
  10
  11                 //Commit the transaction
  12                 if (implicityStarted) {
  13 diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h
  14 --- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h        2006-01-07 03:47:46.000000000 -0500
  15 +++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxconnection.h     2008-07-20 14:29:59.000000000 -0400
  16 @@ -16,7 +16,7 @@
  17
  18  #include <kexidb/connection.h>
  19  #include "pqxxcursor.h"
  20 -#include <pqxx/all.h>
  21 +#include <pqxx/pqxx>
  22
  23
  24  namespace KexiDB
  25 diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
  26 --- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp  2006-01-07 03:47:46.000000000 -0500
  27 +++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp       2008-07-20 14:30:52.000000000 -0400
  28 @@ -84,7 +84,7 @@
  29                         m_implicityStarted = true;
  30                 }
  31
  32 -               m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(statement.utf8()));
  33 +               m_res = new pqxx::result(((pqxxSqlConnection*)connection())->m_trans->data->exec(statement.utf8().data()));
  34                 ((pqxxSqlConnection*)connection())
  35                         ->drv_commitTransaction(((pqxxSqlConnection*)connection())->m_trans);
  36  //             my_conn->m_trans->commit();
  37 diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h
  38 --- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h    2006-01-07 03:47:46.000000000 -0500
  39 +++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxcursor.h 2008-07-20 14:29:51.000000000 -0400
  40 @@ -15,7 +15,7 @@
  41  #include <kexidb/cursor.h>
  42  #include <kexidb/connection.h>
  43
  44 -#include <pqxx/all.h>
  45 +#include <pqxx/pqxx>
  46
  47  namespace KexiDB {
  48
  49 diff -Naur showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
  50 --- showimg-0.9.5-orig/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp  2006-01-07 03:47:46.000000000 -0500
  51 +++ showimg-0.9.5/showimg/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp       2008-07-20 14:30:24.000000000 -0400
  52 @@ -132,14 +132,14 @@
  53  //
  54  QString pqxxSqlDriver::escapeString( const QString& str) const
  55  {
  56 -    return QString(pqxx::Quote(str.ascii()).c_str());
  57 +     return "'"+QString(pqxx::sqlesc(str.ascii()).c_str())+"'";
  58  }
  59
  60  //==================================================================================
  61  //
  62  QCString pqxxSqlDriver::escapeString( const QCString& str) const
  63  {
  64 -    return QCString(pqxx::Quote(QString(str).ascii()).c_str());
  65 +    return "'"+QCString(pqxx::sqlesc(QString(str).ascii()).c_str())+"'";
  66  }
  67
  68  //==================================================================================