diff options
Diffstat (limited to 'src/sql/drivers/psql')
| -rw-r--r-- | src/sql/drivers/psql/tqsql_psql.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sql/drivers/psql/tqsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp index df79ac2fd..be73b6303 100644 --- a/src/sql/drivers/psql/tqsql_psql.cpp +++ b/src/sql/drivers/psql/tqsql_psql.cpp @@ -120,7 +120,7 @@ bool TQPSQLOpenExtension::open( const TQString& db, return driver->open( db, user, password, host, port, connOpts ); } -static TQSqlError qMakeError( const TQString& err, int type, const TQPSQLPrivate* p ) +static TQSqlError tqMakeError( const TQString& err, int type, const TQPSQLPrivate* p ) { const char *s = PQerrorMessage(p->connection); TQString msg = p->isUtf8 ? TQString::fromUtf8(s) : TQString::fromLocal8Bit(s); @@ -484,7 +484,7 @@ bool TQPSQLResult::reset ( const TQString& query ) setActive( TRUE ); return TRUE; } - setLastError( qMakeError( "Unable to create query", TQSqlError::Statement, d ) ); + setLastError( tqMakeError( "Unable to create query", TQSqlError::Statement, d ) ); return FALSE; } @@ -656,7 +656,7 @@ bool TQPSQLDriver::open( const TQString & db, d->connection = PQconnectdb( connectString.local8Bit().data() ); if ( PQstatus( d->connection ) == CONNECTION_BAD ) { - setLastError( qMakeError("Unable to connect", TQSqlError::Connection, d ) ); + setLastError( tqMakeError("Unable to connect", TQSqlError::Connection, d ) ); setOpenError( TRUE ); return FALSE; } @@ -697,7 +697,7 @@ bool TQPSQLDriver::ping() if ( PQstatus( d->connection ) != CONNECTION_OK ) { PQreset( d->connection ); if ( PQstatus( d->connection ) != CONNECTION_OK ) { - setLastError( qMakeError("Unable to execute ping", TQSqlError::Statement, d ) ); + setLastError( tqMakeError("Unable to execute ping", TQSqlError::Statement, d ) ); return FALSE; } } @@ -720,7 +720,7 @@ bool TQPSQLDriver::beginTransaction() PGresult* res = PQexec( d->connection, "BEGIN" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { PQclear( res ); - setLastError( qMakeError( "Could not begin transaction", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Could not begin transaction", TQSqlError::Transaction, d ) ); return FALSE; } PQclear( res ); @@ -738,7 +738,7 @@ bool TQPSQLDriver::commitTransaction() PGresult* res = PQexec( d->connection, "COMMIT" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { PQclear( res ); - setLastError( qMakeError( "Could not commit transaction", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Could not commit transaction", TQSqlError::Transaction, d ) ); return FALSE; } PQclear( res ); @@ -755,7 +755,7 @@ bool TQPSQLDriver::rollbackTransaction() } PGresult* res = PQexec( d->connection, "ROLLBACK" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { - setLastError( qMakeError( "Could not rollback transaction", TQSqlError::Transaction, d ) ); + setLastError( tqMakeError( "Could not rollback transaction", TQSqlError::Transaction, d ) ); PQclear( res ); return FALSE; } |