From 2d30d19f88f8d2a5e29535eb8b4b40c0ae6204ce Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 May 2012 02:29:38 -0500 Subject: [PATCH] Fix FTBFS on newer pqxx versions (cherry picked from commit da48979ab0b59f0174b10e3fc1073673ede65428) --- kexi/kexidb/drivers/pqxx/pqxxdriver.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index fea3fa57e..3809cd160 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -133,8 +133,10 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const // TQString pqxxSqlDriver::escapeString( const TQString& str) const { + TQString escaped = str; + escaped.replace("'", "''"); return TQString::fromLatin1("'") - + TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() ) + + escaped + TQString::fromLatin1("'"); } @@ -142,8 +144,10 @@ TQString pqxxSqlDriver::escapeString( const TQString& str) const // TQCString pqxxSqlDriver::escapeString( const TQCString& str) const { + TQString escaped = str; + escaped.replace("'", "''"); return TQCString("'") - + TQCString( pqxx::sqlesc(TQString(str).ascii()).c_str() ) + + TQCString( escaped.ascii() ) + TQCString("'"); }