diff options
Diffstat (limited to 'src/sql/drivers')
| -rw-r--r-- | src/sql/drivers/cache/tqsqlcachedresult.cpp | 46 | ||||
| -rw-r--r-- | src/sql/drivers/ibase/tqsql_ibase.cpp | 140 | ||||
| -rw-r--r-- | src/sql/drivers/mysql/tqsql_mysql.cpp | 108 | ||||
| -rw-r--r-- | src/sql/drivers/odbc/tqsql_odbc.cpp | 246 | ||||
| -rw-r--r-- | src/sql/drivers/psql/tqsql_psql.cpp | 86 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite/tqsql_sqlite.cpp | 86 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite3/tqsql_sqlite3.cpp | 10 |
7 files changed, 361 insertions, 361 deletions
diff --git a/src/sql/drivers/cache/tqsqlcachedresult.cpp b/src/sql/drivers/cache/tqsqlcachedresult.cpp index 709e61944..b22c56b28 100644 --- a/src/sql/drivers/cache/tqsqlcachedresult.cpp +++ b/src/sql/drivers/cache/tqsqlcachedresult.cpp @@ -61,7 +61,7 @@ public: }; TQtSqlCachedResultPrivate::TQtSqlCachedResultPrivate(): - cache(0), current(0), rowCacheEnd(0), colCount(0), forwardOnly(FALSE) + cache(0), current(0), rowCacheEnd(0), colCount(0), forwardOnly(false) { } @@ -76,7 +76,7 @@ void TQtSqlCachedResultPrivate::cleanup() if (forwardOnly) delete current; current = 0; - forwardOnly = FALSE; + forwardOnly = false; colCount = 0; rowCacheEnd = 0; } @@ -108,11 +108,11 @@ TQtSqlCachedResult::RowCache *TQtSqlCachedResultPrivate::next() bool TQtSqlCachedResultPrivate::seek(int i) { if (forwardOnly || i < 0) - return FALSE; + return false; if (i >= rowCacheEnd) - return FALSE; + return false; current = (*cache)[i]; - return TRUE; + return true; } void TQtSqlCachedResultPrivate::revertLast() @@ -144,40 +144,40 @@ void TQtSqlCachedResult::init(int colCount) bool TQtSqlCachedResult::fetch(int i) { if ((!isActive()) || (i < 0)) - return FALSE; + return false; if (at() == i) - return TRUE; + return true; if (d->forwardOnly) { // speed hack - do not copy values if not needed if (at() > i || at() == TQSql::AfterLast) - return FALSE; + return false; while(at() < i - 1) { if (!gotoNext(0)) - return FALSE; + return false; setAt(at() + 1); } if (!gotoNext(d->current)) - return FALSE; + return false; setAt(at() + 1); - return TRUE; + return true; } if (d->seek(i)) { setAt(i); - return TRUE; + return true; } setAt(d->rowCacheEnd - 1); while (at() < i) { if (!cacheNext()) - return FALSE; + return false; } - return TRUE; + return true; } bool TQtSqlCachedResult::fetchNext() { if (d->seek(at() + 1)) { setAt(at() + 1); - return TRUE; + return true; } return cacheNext(); } @@ -190,11 +190,11 @@ bool TQtSqlCachedResult::fetchPrev() bool TQtSqlCachedResult::fetchFirst() { if (d->forwardOnly && at() != TQSql::BeforeFirst) { - return FALSE; + return false; } if (d->seek(0)) { setAt(0); - return TRUE; + return true; } return cacheNext(); } @@ -203,7 +203,7 @@ bool TQtSqlCachedResult::fetchLast() { if (at() == TQSql::AfterLast) { if (d->forwardOnly) - return FALSE; + return false; else return fetch(d->rowCacheEnd - 1); } @@ -213,7 +213,7 @@ bool TQtSqlCachedResult::fetchLast() i++; /* brute force */ if (d->forwardOnly && at() == TQSql::AfterLast) { setAt(i); - return TRUE; + return true; } else { return fetch(d->rowCacheEnd - 1); } @@ -230,7 +230,7 @@ TQVariant TQtSqlCachedResult::data(int i) bool TQtSqlCachedResult::isNull(int i) { if (!d->current || i >= (int)d->current->size() || i < 0) - return TRUE; + return true; return (*d->current)[i].isNull(); } @@ -238,7 +238,7 @@ bool TQtSqlCachedResult::isNull(int i) void TQtSqlCachedResult::cleanup() { setAt(TQSql::BeforeFirst); - setActive(FALSE); + setActive(false); d->cleanup(); } @@ -246,10 +246,10 @@ bool TQtSqlCachedResult::cacheNext() { if (!gotoNext(d->next())) { d->revertLast(); - return FALSE; + return false; } setAt(at() + 1); - return TRUE; + return true; } int TQtSqlCachedResult::colCount() const diff --git a/src/sql/drivers/ibase/tqsql_ibase.cpp b/src/sql/drivers/ibase/tqsql_ibase.cpp index 425d0e311..f7e29999d 100644 --- a/src/sql/drivers/ibase/tqsql_ibase.cpp +++ b/src/sql/drivers/ibase/tqsql_ibase.cpp @@ -46,13 +46,13 @@ public: static bool getIBaseError(TQString& msg, ISC_STATUS* status, long &sqlcode) { if (status[0] != 1 || status[1] <= 0) - return FALSE; + return false; sqlcode = isc_sqlcode(status); char buf[512]; isc_sql_interprete(sqlcode, buf, 512); msg = TQString::fromUtf8(buf); - return TRUE; + return true; } static void createDA(XSQLDA *&sqlda) @@ -227,10 +227,10 @@ public: TQString imsg; long sqlcode; if (!getIBaseError(imsg, status, sqlcode)) - return FALSE; + return false; q->setLastError(TQSqlError(msg, imsg, typ, (int)sqlcode)); - return TRUE; + return true; } public: @@ -252,10 +252,10 @@ public: TQString imsg; long sqlcode; if (!getIBaseError(imsg, status, sqlcode)) - return FALSE; + return false; q->setLastError(TQSqlError(msg, imsg, typ, (int)sqlcode)); - return TRUE; + return true; } bool transaction(); @@ -356,7 +356,7 @@ bool TQIBaseResultPrivate::isSelect() char qType = isc_info_sql_stmt_type; isc_dsql_sql_info(status, &stmt, 1, &qType, sizeof(acBuffer), acBuffer); if (isError("Could not get query info", TQSqlError::Statement)) - return FALSE; + return false; int iLength = isc_vax_integer(&acBuffer[1], 2); queryType = isc_vax_integer(&acBuffer[3], iLength); return (queryType == isc_info_sql_stmt_select); @@ -365,19 +365,19 @@ bool TQIBaseResultPrivate::isSelect() bool TQIBaseResultPrivate::transaction() { if (trans) - return TRUE; + return true; if (db->d->trans) { - localTransaction = FALSE; + localTransaction = false; trans = db->d->trans; - return TRUE; + return true; } - localTransaction = TRUE; + localTransaction = true; isc_start_transaction(status, &trans, 1, &ibase, 0, NULL); if (isError("Could not start transaction", TQSqlError::Statement)) - return FALSE; + return false; - return TRUE; + return true; } // does nothing if the transaction is on the @@ -385,10 +385,10 @@ bool TQIBaseResultPrivate::transaction() bool TQIBaseResultPrivate::commit() { if (!trans) - return FALSE; + return false; // don't commit driver's transaction, the driver will do it for us if (!localTransaction) - return TRUE; + return true; isc_commit_transaction(status, &trans); trans = 0; @@ -413,33 +413,33 @@ bool TQIBaseResult::prepare(const TQString& query) { //tqDebug("prepare: %s", query.ascii()); if (!driver() || !driver()->isOpen() || driver()->isOpenError()) - return FALSE; + return false; d->cleanup(); - setActive(FALSE); + setActive(false); setAt(TQSql::BeforeFirst); createDA(d->sqlda); createDA(d->inda); if (!d->transaction()) - return FALSE; + return false; isc_dsql_allocate_statement(d->status, &d->ibase, &d->stmt); if (d->isError("Could not allocate statement", TQSqlError::Statement)) - return FALSE; + return false; isc_dsql_prepare(d->status, &d->trans, &d->stmt, 0, query.utf8().data(), 3, d->sqlda); if (d->isError("Could not prepare statement", TQSqlError::Statement)) - return FALSE; + return false; isc_dsql_describe_bind(d->status, &d->stmt, 1, d->inda); if (d->isError("Could not describe input statement", TQSqlError::Statement)) - return FALSE; + return false; if (d->inda->sqld > d->inda->sqln) { enlargeDA(d->inda, d->inda->sqld); isc_dsql_describe_bind(d->status, &d->stmt, 1, d->inda); if (d->isError("Could not describe input statement", TQSqlError::Statement)) - return FALSE; + return false; } initDA(d->inda); if (d->sqlda->sqld > d->sqlda->sqln) { @@ -448,7 +448,7 @@ bool TQIBaseResult::prepare(const TQString& query) isc_dsql_describe(d->status, &d->stmt, 1, d->sqlda); if (d->isError("Could not describe statement", TQSqlError::Statement)) - return FALSE; + return false; } initDA(d->sqlda); @@ -458,21 +458,21 @@ bool TQIBaseResult::prepare(const TQString& query) d->sqlda = 0; } - return TRUE; + return true; } bool TQIBaseResult::exec() { if (!driver() || !driver()->isOpen() || driver()->isOpenError()) - return FALSE; - setActive(FALSE); + return false; + setActive(false); setAt(TQSql::BeforeFirst); if (d->inda && extension()->index.count() > 0) { TQMap<int, TQString>::ConstIterator it; if ((int)extension()->index.count() > d->inda->sqld) { tqWarning("TQIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count()); - return FALSE; + return false; } int para = 0; for (it = extension()->index.constBegin(); it != extension()->index.constEnd(); ++it, ++para) { @@ -530,7 +530,7 @@ bool TQIBaseResult::exec() memcpy(d->inda->sqlvar[para].sqldata + sizeof(short), str.data(), buflen); break; } case SQL_TEXT: { - TQCString str(val.toString().utf8().leftJustify(d->inda->sqlvar[para].sqllen, ' ', TRUE)); + TQCString str(val.toString().utf8().leftJustify(d->inda->sqlvar[para].sqllen, ' ', true)); memcpy(d->inda->sqlvar[para].sqldata, str.data(), d->inda->sqlvar[para].sqllen); break; } case SQL_BLOB: @@ -545,39 +545,39 @@ bool TQIBaseResult::exec() if (colCount()) { isc_dsql_free_statement(d->status, &d->stmt, DSQL_close); if (d->isError("Unable to close statement")) - return FALSE; + return false; cleanup(); } if (d->sqlda) init(d->sqlda->sqld); isc_dsql_execute2(d->status, &d->trans, &d->stmt, 1, d->inda, 0); if (d->isError("Unable to execute query")) - return FALSE; + return false; - setActive(TRUE); - return TRUE; + setActive(true); + return true; } bool TQIBaseResult::reset (const TQString& query) { // tqDebug("reset: %s", query.ascii()); if (!driver() || !driver()->isOpen() || driver()->isOpenError()) - return FALSE; + return false; d->cleanup(); - setActive(FALSE); + setActive(false); setAt(TQSql::BeforeFirst); createDA(d->sqlda); if (!d->transaction()) - return FALSE; + return false; isc_dsql_allocate_statement(d->status, &d->ibase, &d->stmt); if (d->isError("Could not allocate statement", TQSqlError::Statement)) - return FALSE; + return false; isc_dsql_prepare(d->status, &d->trans, &d->stmt, 0, query.utf8().data(), 3, d->sqlda); if (d->isError("Could not prepare statement", TQSqlError::Statement)) - return FALSE; + return false; if (d->sqlda->sqld > d->sqlda->sqln) { // need more field descriptors @@ -589,7 +589,7 @@ bool TQIBaseResult::reset (const TQString& query) isc_dsql_describe(d->status, &d->stmt, 1, d->sqlda); if (d->isError("Could not describe statement", TQSqlError::Statement)) - return FALSE; + return false; } initDA(d->sqlda); @@ -604,14 +604,14 @@ bool TQIBaseResult::reset (const TQString& query) isc_dsql_execute(d->status, &d->trans, &d->stmt, 1, 0); if (d->isError("Unable to execute query")) - return FALSE; + return false; // commit non-select queries (if they are local) if (!isSelect() && !d->commit()) - return FALSE; + return false; - setActive(TRUE); - return TRUE; + setActive(true); + return true; } bool TQIBaseResult::gotoNext(TQtSqlCachedResult::RowCache* row) @@ -621,12 +621,12 @@ bool TQIBaseResult::gotoNext(TQtSqlCachedResult::RowCache* row) if (stat == 100) { // no more rows setAt(TQSql::AfterLast); - return FALSE; + return false; } if (d->isError("Could not fetch next item", TQSqlError::Statement)) - return FALSE; + return false; if (!row) // not interested in actual values - return TRUE; + return true; Q_ASSERT(row); Q_ASSERT((int)row->size() == d->sqlda->sqld); @@ -691,7 +691,7 @@ bool TQIBaseResult::gotoNext(TQtSqlCachedResult::RowCache* row) } } - return TRUE; + return true; } int TQIBaseResult::size() @@ -768,8 +768,8 @@ TQIBaseDriver::TQIBaseDriver(void *connection, TQObject *parent, const char *nam { d = new TQIBaseDriverPrivate(this); d->ibase = (isc_db_handle)(long int)connection; - setOpen(TRUE); - setOpenError(FALSE); + setOpen(true); + setOpenError(false); } TQIBaseDriver::~TQIBaseDriver() @@ -786,9 +786,9 @@ bool TQIBaseDriver::hasFeature(DriverFeature f) const case PositionalPlaceholders: case Unicode: case BLOB: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -830,12 +830,12 @@ bool TQIBaseDriver::open(const TQString & db, ldb += db; isc_attach_database(d->status, 0, (char*)ldb.latin1(), &d->ibase, i, ba.data()); if (d->isError("Error opening database", TQSqlError::Connection)) { - setOpenError(TRUE); - return FALSE; + setOpenError(true); + return false; } - setOpen(TRUE); - return TRUE; + setOpen(true); + return true; } void TQIBaseDriver::close() @@ -843,20 +843,20 @@ void TQIBaseDriver::close() if (isOpen()) { isc_detach_database(d->status, &d->ibase); d->ibase = 0; - setOpen(FALSE); - setOpenError(FALSE); + setOpen(false); + setOpenError(false); } } bool TQIBaseDriver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } // FIXME // Implement ping if available - return TRUE; + return true; } TQSqlQuery TQIBaseDriver::createQuery() const @@ -867,9 +867,9 @@ TQSqlQuery TQIBaseDriver::createQuery() const bool TQIBaseDriver::beginTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; if (d->trans) - return FALSE; + return false; isc_start_transaction(d->status, &d->trans, 1, &d->ibase, 0, NULL); return !d->isError("Could not start transaction", TQSqlError::Transaction); @@ -878,9 +878,9 @@ bool TQIBaseDriver::beginTransaction() bool TQIBaseDriver::commitTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; if (!d->trans) - return FALSE; + return false; isc_commit_transaction(d->status, &d->trans); d->trans = 0; @@ -890,9 +890,9 @@ bool TQIBaseDriver::commitTransaction() bool TQIBaseDriver::rollbackTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; if (!d->trans) - return FALSE; + return false; isc_rollback_transaction(d->status, &d->trans); d->trans = 0; @@ -926,7 +926,7 @@ TQStringList TQIBaseDriver::tables(const TQString& typeName) const typeFilter.prepend("where "); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); if (!q.exec("select rdb$relation_name from rdb$relations " + typeFilter)) return res; while(q.next()) @@ -942,7 +942,7 @@ TQSqlRecord TQIBaseDriver::record(const TQString& tablename) const return rec; TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT a.RDB$FIELD_NAME, b.RDB$FIELD_TYPE " "FROM RDB$RELATION_FIELDS a, RDB$FIELDS b " @@ -964,7 +964,7 @@ TQSqlRecordInfo TQIBaseDriver::recordInfo(const TQString& tablename) const return rec; TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT a.RDB$FIELD_NAME, b.RDB$FIELD_TYPE, b.RDB$FIELD_LENGTH, b.RDB$FIELD_SCALE, " "b.RDB$FIELD_PRECISION, a.RDB$NULL_FLAG " @@ -991,7 +991,7 @@ TQSqlIndex TQIBaseDriver::primaryIndex(const TQString &table) const return index; TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT a.RDB$INDEX_NAME, b.RDB$FIELD_NAME, d.RDB$FIELD_TYPE " "FROM RDB$RELATION_CONSTRAINTS a, RDB$INDEX_SEGMENTS b, RDB$RELATION_FIELDS c, RDB$FIELDS d " "WHERE a.RDB$CONSTRAINT_TYPE = 'PRIMARY KEY' " @@ -1060,7 +1060,7 @@ TQString TQIBaseDriver::formatValue(const TQSqlField* field, bool trimStrings) c TQString::number(datetime.time().hour()) + ":" + TQString::number(datetime.time().minute()) + ":" + TQString::number(datetime.time().second()) + "." + - TQString::number(datetime.time().msec()).rightJustify(3, '0', TRUE) + "'"; + TQString::number(datetime.time().msec()).rightJustify(3, '0', true) + "'"; else return "NULL"; } @@ -1070,7 +1070,7 @@ TQString TQIBaseDriver::formatValue(const TQSqlField* field, bool trimStrings) c return "'" + TQString::number(time.hour()) + ":" + TQString::number(time.minute()) + ":" + TQString::number(time.second()) + "." + - TQString::number(time.msec()).rightJustify(3, '0', TRUE) + "'"; + TQString::number(time.msec()).rightJustify(3, '0', true) + "'"; else return "NULL"; } diff --git a/src/sql/drivers/mysql/tqsql_mysql.cpp b/src/sql/drivers/mysql/tqsql_mysql.cpp index 603a5b960..47e3c6ff0 100644 --- a/src/sql/drivers/mysql/tqsql_mysql.cpp +++ b/src/sql/drivers/mysql/tqsql_mysql.cpp @@ -56,7 +56,7 @@ TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); static int qMySqlConnectionCount = 0; -static bool qMySqlInitHandledByUser = FALSE; +static bool qMySqlInitHandledByUser = false; class TQMYSQLOpenExtension : public TQSqlOpenExtension { @@ -181,7 +181,7 @@ void TQMYSQLResult::cleanup() d->result = NULL; d->row = NULL; setAt( -1 ); - setActive( FALSE ); + setActive( false ); } bool TQMYSQLResult::fetch( int i ) @@ -192,26 +192,26 @@ bool TQMYSQLResult::fetch( int i ) while ( --x && fetchNext() ); return fetchNext(); } else { - return FALSE; + return false; } } if ( at() == i ) - return TRUE; + return true; mysql_data_seek( d->result, i ); d->row = mysql_fetch_row( d->result ); if ( !d->row ) - return FALSE; + return false; setAt( i ); - return TRUE; + return true; } bool TQMYSQLResult::fetchNext() { d->row = mysql_fetch_row( d->result ); if ( !d->row ) - return FALSE; + return false; setAt( at() + 1 ); - return TRUE; + return true; } bool TQMYSQLResult::fetchLast() @@ -223,7 +223,7 @@ bool TQMYSQLResult::fetchLast() } my_ulonglong numRows = mysql_num_rows( d->result ); if ( !numRows ) - return FALSE; + return false; return fetch( numRows - 1 ); } @@ -292,22 +292,22 @@ TQVariant TQMYSQLResult::data( int field ) bool TQMYSQLResult::isNull( int field ) { if ( d->row[field] == NULL ) - return TRUE; - return FALSE; + return true; + return false; } bool TQMYSQLResult::reset ( const TQString& query ) { if ( !driver() ) - return FALSE; + return false; if ( !driver()-> isOpen() || driver()->isOpenError() ) - return FALSE; + return false; cleanup(); const char *encQuery = query.ascii(); if ( mysql_real_query( d->mysql, encQuery, tqstrlen(encQuery) ) ) { setLastError( qMakeError("Unable to execute query", TQSqlError::Statement, d ) ); - return FALSE; + return false; } if ( isForwardOnly() ) { if ( isActive() || isValid() ) // have to empty the results from previous query @@ -318,7 +318,7 @@ bool TQMYSQLResult::reset ( const TQString& query ) } if ( !d->result && mysql_field_count( d->mysql ) > 0 ) { setLastError( qMakeError( "Unable to store result", TQSqlError::Statement, d ) ); - return FALSE; + return false; } int numFields = mysql_field_count( d->mysql ); setSelect( !( numFields == 0) ); @@ -332,8 +332,8 @@ bool TQMYSQLResult::reset ( const TQString& query ) d->fieldTypes[i] = qDecodeMYSQLType( field->type, field->flags ); } } - setActive( TRUE ); - return TRUE; + setActive( true ); + return true; } int TQMYSQLResult::size() @@ -403,10 +403,10 @@ TQMYSQLDriver::TQMYSQLDriver( MYSQL * con, TQObject * parent, const char * name init(); if ( con ) { d->mysql = (MYSQL *) con; - setOpen( TRUE ); - setOpenError( FALSE ); + setOpen( true ); + setOpenError( false ); if (qMySqlConnectionCount == 1) - qMySqlInitHandledByUser = TRUE; + qMySqlInitHandledByUser = true; } else { qServerInit(); } @@ -441,18 +441,18 @@ bool TQMYSQLDriver::hasFeature( DriverFeature f ) const #ifdef CLIENT_TRANSACTIONS if ( d->mysql ) { if ( ( d->mysql->server_capabilities & CLIENT_TRANSACTIONS ) == CLIENT_TRANSACTIONS ) - return TRUE; + return true; } #endif - return FALSE; + return false; case QuerySize: - return TRUE; + return true; case BLOB: - return TRUE; + return true; case Unicode: - return FALSE; + return false; default: - return FALSE; + return false; } } @@ -463,7 +463,7 @@ bool TQMYSQLDriver::open( const TQString&, int ) { tqWarning("TQMYSQLDriver::open(): This version of open() is no longer supported." ); - return FALSE; + return false; } bool TQMYSQLDriver::open( const TQString& db, @@ -513,8 +513,8 @@ bool TQMYSQLDriver::open( const TQString& db, if (!(d->mysql = mysql_init((MYSQL*) 0))) { setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) ); mysql_close( d->mysql ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } bool reconnect = 0; @@ -563,41 +563,41 @@ bool TQMYSQLDriver::open( const TQString& db, if ( !db.isEmpty() && mysql_select_db( d->mysql, db )) { setLastError( qMakeError("Unable open database '" + db + "'", TQSqlError::Connection, d ) ); mysql_close( d->mysql ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } } else { setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) ); mysql_close( d->mysql ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } - setOpen( TRUE ); - setOpenError( FALSE ); - return TRUE; + setOpen( true ); + setOpenError( false ); + return true; } void TQMYSQLDriver::close() { if ( isOpen() ) { mysql_close( d->mysql ); - setOpen( FALSE ); - setOpenError( FALSE ); + setOpen( false ); + setOpenError( false ); } } bool TQMYSQLDriver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } if (mysql_ping( d->mysql )) { - return TRUE; + return true; } else { setLastError( qMakeError("Unable to execute ping", TQSqlError::Statement, d ) ); - return FALSE; + return false; } } @@ -617,7 +617,7 @@ TQStringList TQMYSQLDriver::tables( const TQString& typeName ) const MYSQL_RES* tableRes = mysql_list_tables( d->mysql, NULL ); MYSQL_ROW row; int i = 0; - while ( tableRes && TRUE ) { + while ( tableRes ) { mysql_data_seek( tableRes, i ); row = mysql_fetch_row( tableRes ); if ( !row ) @@ -749,55 +749,55 @@ MYSQL* TQMYSQLDriver::mysql() bool TQMYSQLDriver::beginTransaction() { #ifndef CLIENT_TRANSACTIONS - return FALSE; + return false; #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE tqWarning( "TQMYSQLDriver::beginTransaction: Database not open" ); #endif - return FALSE; + return false; } if ( mysql_query( d->mysql, "BEGIN WORK" ) ) { setLastError( qMakeError("Unable to begin transaction", TQSqlError::Statement, d ) ); - return FALSE; + return false; } - return TRUE; + return true; } bool TQMYSQLDriver::commitTransaction() { #ifndef CLIENT_TRANSACTIONS - return FALSE; + return false; #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE tqWarning( "TQMYSQLDriver::commitTransaction: Database not open" ); #endif - return FALSE; + return false; } if ( mysql_query( d->mysql, "COMMIT" ) ) { setLastError( qMakeError("Unable to commit transaction", TQSqlError::Statement, d ) ); - return FALSE; + return false; } - return TRUE; + return true; } bool TQMYSQLDriver::rollbackTransaction() { #ifndef CLIENT_TRANSACTIONS - return FALSE; + return false; #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE tqWarning( "TQMYSQLDriver::rollbackTransaction: Database not open" ); #endif - return FALSE; + return false; } if ( mysql_query( d->mysql, "ROLLBACK" ) ) { setLastError( qMakeError("Unable to rollback transaction", TQSqlError::Statement, d ) ); - return FALSE; + return false; } - return TRUE; + return true; } TQString TQMYSQLDriver::formatValue( const TQSqlField* field, bool trimStrings ) const diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp index 3da2dd50c..bc09fb28b 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -81,10 +81,10 @@ class TQODBCPrivate { public: TQODBCPrivate() - : hEnv(0), hDbc(0), hStmt(0), useSchema(FALSE) + : hEnv(0), hDbc(0), hStmt(0), useSchema(false) { sql_char_type = sql_varchar_type = sql_longvarchar_type = TQVariant::CString; - unicode = FALSE; + unicode = false; } SQLHANDLE hEnv; @@ -258,7 +258,7 @@ static TQVariant::Type qDecodeODBCType( SQLSMALLINT sqltype, const TQODBCPrivate return type; } -static TQString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& isNull, bool unicode = FALSE ) +static TQString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& isNull, bool unicode = false ) { TQString fieldVal; SQLRETURN r = SQL_ERROR; @@ -275,7 +275,7 @@ static TQString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& } } char* buf = new char[ colSize ]; - while ( TRUE ) { + while ( true ) { r = SQLGetData( hStmt, column+1, unicode ? SQL_C_WCHAR : SQL_C_CHAR, @@ -285,7 +285,7 @@ static TQString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& if ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) { if ( lengthIndicator == SQL_NULL_DATA || lengthIndicator == SQL_NO_TOTAL ) { fieldVal = TQString::null; - isNull = TRUE; + isNull = true; break; } // if SQL_SUCCESS_WITH_INFO is returned, indicating that @@ -350,7 +350,7 @@ static TQByteArray qGetBinaryData( SQLHANDLE hStmt, int column, TQSQLLEN& length colSize = 65536; } char * buf = new char[ colSize ]; - while ( TRUE ) { + while ( true ) { r = SQLGetData( hStmt, column+1, SQL_C_BINARY, @@ -359,7 +359,7 @@ static TQByteArray qGetBinaryData( SQLHANDLE hStmt, int column, TQSQLLEN& length &lengthIndicator ); if ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) { if ( lengthIndicator == SQL_NULL_DATA ) { - isNull = TRUE; + isNull = true; break; } else { int rSize; @@ -391,7 +391,7 @@ static TQByteArray qGetBinaryData( SQLHANDLE hStmt, int column, TQSQLLEN& length static int qGetIntData( SQLHANDLE hStmt, int column, bool& isNull ) { TQSQLLEN intbuf = 0; - isNull = FALSE; + isNull = false; TQSQLLEN lengthIndicator = 0; SQLRETURN r = SQLGetData( hStmt, column+1, @@ -400,7 +400,7 @@ static int qGetIntData( SQLHANDLE hStmt, int column, bool& isNull ) (TQSQLLEN)0, &lengthIndicator ); if ( ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) || lengthIndicator == SQL_NULL_DATA ) { - isNull = TRUE; + isNull = true; return 0; } return (int)intbuf; @@ -410,7 +410,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull ) { SQLDOUBLE dblbuf; TQSQLLEN lengthIndicator = 0; - isNull = FALSE; + isNull = false; SQLRETURN r = SQLGetData( hStmt, column+1, SQL_C_DOUBLE, @@ -418,7 +418,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull ) (TQSQLLEN)0, &lengthIndicator ); if ( ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) || lengthIndicator == SQL_NULL_DATA ) { - isNull = TRUE; + isNull = true; return 0.0; } @@ -428,7 +428,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull ) static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull ) { SQLBIGINT lngbuf = TQ_INT64_C( 0 ); - isNull = FALSE; + isNull = false; TQSQLLEN lengthIndicator = 0; SQLRETURN r = SQLGetData( hStmt, column+1, @@ -437,7 +437,7 @@ static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull ) (TQSQLLEN)0, &lengthIndicator ); if ( ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) || lengthIndicator == SQL_NULL_DATA ) - isNull = TRUE; + isNull = true; return lngbuf; } @@ -600,11 +600,11 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) #ifdef QT_CHECK_RANGE qSqlWarning( TQString("TQODBCDriver::open: Unable to set connection attribute '%1'").arg( opt ), this ); #endif - return FALSE; + return false; } } } - return TRUE; + return true; } void TQODBCPrivate::splitTableQualifier(const TQString & qualifier, TQString &catalog, @@ -614,7 +614,7 @@ void TQODBCPrivate::splitTableQualifier(const TQString & qualifier, TQString &ca table = qualifier; return; } - TQStringList l = TQStringList::split( ".", qualifier, TRUE ); + TQStringList l = TQStringList::split( ".", qualifier, true ); if ( l.count() > 3 ) return; // can't possibly be a valid table qualifier int i = 0, n = l.count(); @@ -667,7 +667,7 @@ TQODBCResult::~TQODBCResult() bool TQODBCResult::reset ( const TQString& query ) { - setActive( FALSE ); + setActive( false ); setAt( TQSql::BeforeFirst ); SQLRETURN r; @@ -680,7 +680,7 @@ bool TQODBCResult::reset ( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::reset: Unable to free statement handle", d ); #endif - return FALSE; + return false; } } r = SQLAllocHandle( SQL_HANDLE_STMT, @@ -690,7 +690,7 @@ bool TQODBCResult::reset ( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::reset: Unable to allocate statement handle", d ); #endif - return FALSE; + return false; } if ( isForwardOnly() ) { @@ -708,7 +708,7 @@ bool TQODBCResult::reset ( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration", d ); #endif - return FALSE; + return false; } #ifdef UNICODE @@ -723,38 +723,38 @@ bool TQODBCResult::reset ( const TQString& query ) #endif if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { setLastError( qMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); - return FALSE; + return false; } SQLSMALLINT count; r = SQLNumResultCols( d->hStmt, &count ); if ( count ) { - setSelect( TRUE ); + setSelect( true ); for ( int i = 0; i < count; ++i ) { d->rInf.append( qMakeFieldInfo( d, i ) ); } } else { - setSelect( FALSE ); + setSelect( false ); } - setActive( TRUE ); - return TRUE; + setActive( true ); + return true; } bool TQODBCResult::fetch(int i) { if ( isForwardOnly() && i < at() ) - return FALSE; + return false; if ( i == at() ) - return TRUE; + return true; fieldCache.clear(); nullCache.clear(); int actualIdx = i + 1; if ( actualIdx <= 0 ) { setAt( TQSql::BeforeFirst ); - return FALSE; + return false; } SQLRETURN r; if ( isForwardOnly() ) { - bool ok = TRUE; + bool ok = true; while ( ok && i > at() ) ok = fetchNext(); return ok; @@ -764,10 +764,10 @@ bool TQODBCResult::fetch(int i) actualIdx ); } if ( r != SQL_SUCCESS ){ - return FALSE; + return false; } setAt( i ); - return TRUE; + return true; } bool TQODBCResult::fetchNext() @@ -779,15 +779,15 @@ bool TQODBCResult::fetchNext() SQL_FETCH_NEXT, 0 ); if ( r != SQL_SUCCESS ) - return FALSE; + return false; setAt( at() + 1 ); - return TRUE; + return true; } bool TQODBCResult::fetchFirst() { if ( isForwardOnly() && at() != TQSql::BeforeFirst ) - return FALSE; + return false; SQLRETURN r; fieldCache.clear(); nullCache.clear(); @@ -798,15 +798,15 @@ bool TQODBCResult::fetchFirst() SQL_FETCH_FIRST, 0 ); if ( r != SQL_SUCCESS ) - return FALSE; + return false; setAt( 0 ); - return TRUE; + return true; } bool TQODBCResult::fetchPrior() { if ( isForwardOnly() ) - return FALSE; + return false; SQLRETURN r; fieldCache.clear(); nullCache.clear(); @@ -814,9 +814,9 @@ bool TQODBCResult::fetchPrior() SQL_FETCH_PRIOR, 0 ); if ( r != SQL_SUCCESS ) - return FALSE; + return false; setAt( at() - 1 ); - return TRUE; + return true; } bool TQODBCResult::fetchLast() @@ -829,20 +829,20 @@ bool TQODBCResult::fetchLast() // cannot seek to last row in forwardOnly mode, so we have to use brute force int i = at(); if ( i == TQSql::AfterLast ) - return FALSE; + return false; if ( i == TQSql::BeforeFirst ) i = 0; while ( fetchNext() ) ++i; setAt( i ); - return TRUE; + return true; } r = SQLFetchScroll( d->hStmt, SQL_FETCH_LAST, 0 ); if ( r != SQL_SUCCESS ) { - return FALSE; + return false; } SQLINTEGER currRow; r = SQLGetStmtAttr( d->hStmt, @@ -851,9 +851,9 @@ bool TQODBCResult::fetchLast() SQL_IS_INTEGER, 0 ); if ( r != SQL_SUCCESS ) - return FALSE; + return false; setAt( currRow-1 ); - return TRUE; + return true; } TQVariant TQODBCResult::data( int field ) @@ -866,7 +866,7 @@ TQVariant TQODBCResult::data( int field ) return fieldCache[ field ]; SQLRETURN r(0); TQSQLLEN lengthIndicator = 0; - bool isNull = FALSE; + bool isNull = false; int current = fieldCache.count(); for ( ; current < (field + 1); ++current ) { const TQSqlFieldInfo info = d->rInf[ current ]; @@ -889,10 +889,10 @@ TQVariant TQODBCResult::data( int field ) &lengthIndicator ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( lengthIndicator != SQL_NULL_DATA ) ) { fieldCache[ current ] = TQVariant( TQDate( dbuf.year, dbuf.month, dbuf.day ) ); - nullCache[ current ] = FALSE; + nullCache[ current ] = false; } else { fieldCache[ current ] = TQVariant( TQDate() ); - nullCache[ current ] = TRUE; + nullCache[ current ] = true; } break; case TQVariant::Time: @@ -905,10 +905,10 @@ TQVariant TQODBCResult::data( int field ) &lengthIndicator ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( lengthIndicator != SQL_NULL_DATA ) ) { fieldCache[ current ] = TQVariant( TQTime( tbuf.hour, tbuf.minute, tbuf.second ) ); - nullCache[ current ] = FALSE; + nullCache[ current ] = false; } else { fieldCache[ current ] = TQVariant( TQTime() ); - nullCache[ current ] = TRUE; + nullCache[ current ] = true; } break; case TQVariant::DateTime: @@ -921,38 +921,38 @@ TQVariant TQODBCResult::data( int field ) &lengthIndicator ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( lengthIndicator != SQL_NULL_DATA ) ) { fieldCache[ current ] = TQVariant( TQDateTime( TQDate( dtbuf.year, dtbuf.month, dtbuf.day ), TQTime( dtbuf.hour, dtbuf.minute, dtbuf.second, dtbuf.fraction / 1000000 ) ) ); - nullCache[ current ] = FALSE; + nullCache[ current ] = false; } else { fieldCache[ current ] = TQVariant( TQDateTime() ); - nullCache[ current ] = TRUE; + nullCache[ current ] = true; } break; case TQVariant::ByteArray: { - isNull = FALSE; + isNull = false; TQByteArray val = qGetBinaryData( d->hStmt, current, lengthIndicator, isNull ); fieldCache[ current ] = TQVariant( val ); nullCache[ current ] = isNull; break; } case TQVariant::String: - isNull = FALSE; + isNull = false; fieldCache[ current ] = TQVariant( qGetStringData( d->hStmt, current, - info.length(), isNull, TRUE ) ); + info.length(), isNull, true ) ); nullCache[ current ] = isNull; break; case TQVariant::Double: if ( info.typeID() == SQL_DECIMAL || info.typeID() == SQL_NUMERIC ) // bind Double values as string to prevent loss of precision fieldCache[ current ] = TQVariant( qGetStringData( d->hStmt, current, - info.length() + 1, isNull, FALSE ) ); // length + 1 for the comma + info.length() + 1, isNull, false ) ); // length + 1 for the comma else fieldCache[ current ] = TQVariant( qGetDoubleData( d->hStmt, current, isNull ) ); nullCache[ current ] = isNull; break; case TQVariant::CString: default: - isNull = FALSE; + isNull = false; fieldCache[ current ] = TQVariant( qGetStringData( d->hStmt, current, - info.length(), isNull, FALSE ) ); + info.length(), isNull, false ) ); nullCache[ current ] = isNull; break; } @@ -991,7 +991,7 @@ int TQODBCResult::numRowsAffected() bool TQODBCResult::prepare( const TQString& query ) { - setActive( FALSE ); + setActive( false ); setAt( TQSql::BeforeFirst ); SQLRETURN r; @@ -1002,7 +1002,7 @@ bool TQODBCResult::prepare( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::prepare: Unable to close statement", d ); #endif - return FALSE; + return false; } } r = SQLAllocHandle( SQL_HANDLE_STMT, @@ -1012,7 +1012,7 @@ bool TQODBCResult::prepare( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::prepare: Unable to allocate statement handle", d ); #endif - return FALSE; + return false; } if ( isForwardOnly() ) { @@ -1030,7 +1030,7 @@ bool TQODBCResult::prepare( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::prepare: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration", d ); #endif - return FALSE; + return false; } #ifdef UNICODE @@ -1048,18 +1048,18 @@ bool TQODBCResult::prepare( const TQString& query ) #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::prepare: Unable to prepare statement", d ); #endif - return FALSE; + return false; } - return TRUE; + return true; } bool TQODBCResult::exec() { SQLRETURN r; TQPtrList<TQVirtualDestructor> tmpStorage; // holds temporary ptrs. which will be deleted on fu exit - tmpStorage.setAutoDelete( TRUE ); + tmpStorage.setAutoDelete( true ); - setActive( FALSE ); + setActive( false ); setAt( TQSql::BeforeFirst ); d->rInf.clear(); @@ -1067,12 +1067,12 @@ bool TQODBCResult::exec() #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCResult::exec: No statement handle available", d ); #endif - return FALSE; + return false; } else { r = SQLFreeStmt( d->hStmt, SQL_CLOSE ); if ( r != SQL_SUCCESS ) { qSqlWarning( "TQODBCResult::exec: Unable to close statement handle", d ); - return FALSE; + return false; } } @@ -1232,7 +1232,7 @@ bool TQODBCResult::exec() tqWarning( "TQODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() ); #endif setLastError( qMakeError( "Unable to bind variable", TQSqlError::Statement, d ) ); - return FALSE; + return false; } } } @@ -1242,19 +1242,19 @@ bool TQODBCResult::exec() tqWarning( "TQODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() ); #endif setLastError( qMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); - return FALSE; + return false; } SQLSMALLINT count; r = SQLNumResultCols( d->hStmt, &count ); if ( count ) { - setSelect( TRUE ); + setSelect( true ); for ( int i = 0; i < count; ++i ) { d->rInf.append( qMakeFieldInfo( d, i ) ); } } else { - setSelect( FALSE ); + setSelect( false ); } - setActive( TRUE ); + setActive( true ); //get out parameters if ( extension()->index.count() > 0 ) { @@ -1263,7 +1263,7 @@ bool TQODBCResult::exec() SQLINTEGER* indPtr = qAutoDeleterData( (TQAutoDeleter<SQLINTEGER>*)tmpStorage.getFirst() ); if ( !indPtr ) - return FALSE; + return false; bool isNull = (*indPtr == SQL_NULL_DATA); tmpStorage.removeFirst(); @@ -1318,7 +1318,7 @@ bool TQODBCResult::exec() } } - return TRUE; + return true; } //////////////////////////////////////// @@ -1337,8 +1337,8 @@ TQODBCDriver::TQODBCDriver( SQLHANDLE env, SQLHANDLE con, TQObject * parent, con d->hEnv = env; d->hDbc = con; if ( env && con ) { - setOpen( TRUE ); - setOpenError( FALSE ); + setOpen( true ); + setOpenError( false ); } } @@ -1363,7 +1363,7 @@ bool TQODBCDriver::hasFeature( DriverFeature f ) const switch ( f ) { case Transactions: { if ( !d->hDbc ) - return FALSE; + return false; SQLUSMALLINT txn; SQLSMALLINT t; int r = SQLGetInfo( d->hDbc, @@ -1372,22 +1372,22 @@ bool TQODBCDriver::hasFeature( DriverFeature f ) const sizeof(txn), &t); if ( r != SQL_SUCCESS || txn == SQL_TC_NONE ) - return FALSE; + return false; else - return TRUE; + return true; } case QuerySize: - return FALSE; + return false; case BLOB: - return TRUE; + return true; case Unicode: return d->unicode; case PreparedQueries: - return TRUE; + return true; case PositionalPlaceholders: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -1398,7 +1398,7 @@ bool TQODBCDriver::open( const TQString&, int ) { tqWarning("TQODBCDriver::open(): This version of open() is no longer supported." ); - return FALSE; + return false; } bool TQODBCDriver::open( const TQString & db, @@ -1418,8 +1418,8 @@ bool TQODBCDriver::open( const TQString & db, #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCDriver::open: Unable to allocate environment", d ); #endif - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } r = SQLSetEnvAttr( d->hEnv, SQL_ATTR_ODBC_VERSION, @@ -1432,12 +1432,12 @@ bool TQODBCDriver::open( const TQString & db, #ifdef QT_CHECK_RANGE qSqlWarning( "TQODBCDriver::open: Unable to allocate connection", d ); #endif - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } if ( !d->setConnectionOptions( connOpts ) ) - return FALSE; + return false; // Create the connection string TQString connTQStr; @@ -1465,36 +1465,36 @@ bool TQODBCDriver::open( const TQString & db, SQL_DRIVER_NOPROMPT ); if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { setLastError( qMakeError( "Unable to connect", TQSqlError::Connection, d ) ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } if ( !d->checkDriver() ) { setLastError( qMakeError( "Unable to connect - Driver doesn't support all needed functionality", TQSqlError::Connection, d ) ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } d->checkUnicode(); d->checkSchemaUsage(); - setOpen( TRUE ); - setOpenError( FALSE ); - return TRUE; + setOpen( true ); + setOpenError( false ); + return true; } void TQODBCDriver::close() { cleanup(); - setOpen( FALSE ); - setOpenError( FALSE ); + setOpen( false ); + setOpenError( false ); } bool TQODBCDriver::ping() { // FIXME // Implement ping if supported - return TRUE; + return true; } void TQODBCDriver::cleanup() @@ -1537,14 +1537,14 @@ void TQODBCPrivate::checkUnicode() { #if defined(TQ_WS_WIN) if ( !qt_winunicode ) { - unicode = FALSE; + unicode = false; return; } #endif SQLRETURN r; SQLUINTEGER fFunc; - unicode = FALSE; + unicode = false; r = SQLGetInfo( hDbc, SQL_CONVERT_CHAR, (SQLPOINTER)&fFunc, @@ -1552,7 +1552,7 @@ void TQODBCPrivate::checkUnicode() NULL ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( fFunc & SQL_CVT_WCHAR ) ) { sql_char_type = TQVariant::String; - unicode = TRUE; + unicode = true; } r = SQLGetInfo( hDbc, @@ -1562,7 +1562,7 @@ void TQODBCPrivate::checkUnicode() NULL ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( fFunc & SQL_CVT_WVARCHAR ) ) { sql_varchar_type = TQVariant::String; - unicode = TRUE; + unicode = true; } r = SQLGetInfo( hDbc, @@ -1572,7 +1572,7 @@ void TQODBCPrivate::checkUnicode() NULL ); if ( ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) && ( fFunc & SQL_CVT_WLONGVARCHAR ) ) { sql_longvarchar_type = TQVariant::String; - unicode = TRUE; + unicode = true; } } @@ -1604,7 +1604,7 @@ bool TQODBCPrivate::checkDriver() const #ifdef QT_CHECK_RANGE if ( r != SQL_SUCCESS ) { qSqlWarning( "TQODBCDriver::checkDriver: Cannot get list of supported functions", this ); - return FALSE; + return false; } #endif if ( sup == SQL_FALSE ) { @@ -1612,7 +1612,7 @@ bool TQODBCPrivate::checkDriver() const tqWarning ( "TQODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). " "Please look at the TQt SQL Module Driver documentation for more information.", reqFunc[ i ] ); #endif - return FALSE; + return false; } } @@ -1624,19 +1624,19 @@ bool TQODBCPrivate::checkDriver() const #ifdef QT_CHECK_RANGE if ( r != SQL_SUCCESS ) { qSqlWarning( "TQODBCDriver::checkDriver: Cannot get list of supported functions", this ); - return FALSE; + return false; } #endif if ( sup == SQL_FALSE ) { #ifdef QT_CHECK_RANGE tqWarning( "TQODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] ); #endif - return TRUE; + return true; } } #endif //ODBC_CHECK_DRIVER - return TRUE; + return true; } void TQODBCPrivate::checkSchemaUsage() @@ -1664,7 +1664,7 @@ bool TQODBCDriver::beginTransaction() #ifdef QT_CHECK_RANGE tqWarning(" TQODBCDriver::beginTransaction: Database not open" ); #endif - return FALSE; + return false; } SQLUINTEGER ac(SQL_AUTOCOMMIT_OFF); SQLRETURN r = SQLSetConnectAttr( d->hDbc, @@ -1673,9 +1673,9 @@ bool TQODBCDriver::beginTransaction() sizeof(ac) ); if ( r != SQL_SUCCESS ) { setLastError( qMakeError( "Unable to disable autocommit", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } - return TRUE; + return true; } bool TQODBCDriver::commitTransaction() @@ -1684,14 +1684,14 @@ bool TQODBCDriver::commitTransaction() #ifdef QT_CHECK_RANGE tqWarning(" TQODBCDriver::commitTransaction: Database not open" ); #endif - return FALSE; + return false; } SQLRETURN r = SQLEndTran( SQL_HANDLE_DBC, d->hDbc, SQL_COMMIT ); if ( r != SQL_SUCCESS ) { setLastError( qMakeError("Unable to commit transaction", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } return endTrans(); } @@ -1702,14 +1702,14 @@ bool TQODBCDriver::rollbackTransaction() #ifdef QT_CHECK_RANGE tqWarning(" TQODBCDriver::rollbackTransaction: Database not open" ); #endif - return FALSE; + return false; } SQLRETURN r = SQLEndTran( SQL_HANDLE_DBC, d->hDbc, SQL_ROLLBACK ); if ( r != SQL_SUCCESS ) { setLastError( qMakeError( "Unable to rollback transaction", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } return endTrans(); } @@ -1723,9 +1723,9 @@ bool TQODBCDriver::endTrans() sizeof(ac)); if ( r != SQL_SUCCESS ) { setLastError( qMakeError( "Unable to enable autocommit", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } - return TRUE; + return true; } TQStringList TQODBCDriver::tables( const TQString& typeName ) const @@ -1801,7 +1801,7 @@ TQSqlIndex TQODBCDriver::primaryIndex( const TQString& tablename ) const TQSqlIndex index( tablename ); if ( !isOpen() ) return index; - bool usingSpecialColumns = FALSE; + bool usingSpecialColumns = false; TQSqlRecord rec = record( tablename ); SQLHANDLE hStmt; @@ -1873,7 +1873,7 @@ TQSqlIndex TQODBCDriver::primaryIndex( const TQString& tablename ) const qSqlWarning( "TQODBCDriver::primaryIndex: Unable to execute primary key list", d ); #endif } else { - usingSpecialColumns = TRUE; + usingSpecialColumns = true; } } r = SQLFetchScroll( hStmt, @@ -2018,8 +2018,8 @@ TQString TQODBCDriver::formatValue( const TQSqlField* field, // Dateformat has to be "yyyy-MM-dd hh:mm:ss", with leading zeroes if month or day < 10 r = "{ ts '" + TQString::number(dt.year()) + "-" + - TQString::number(dt.month()).rightJustify( 2, '0', TRUE ) + "-" + - TQString::number(dt.day()).rightJustify( 2, '0', TRUE ) + " " + + TQString::number(dt.month()).rightJustify( 2, '0', true ) + "-" + + TQString::number(dt.day()).rightJustify( 2, '0', true ) + " " + tm.toString() + "' }"; } else diff --git a/src/sql/drivers/psql/tqsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp index df79ac2fd..625177c7b 100644 --- a/src/sql/drivers/psql/tqsql_psql.cpp +++ b/src/sql/drivers/psql/tqsql_psql.cpp @@ -70,7 +70,7 @@ TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); class TQPSQLPrivate { public: - TQPSQLPrivate():connection(0), result(0), isUtf8(FALSE) {} + TQPSQLPrivate():connection(0), result(0), isUtf8(false) {} PGconn *connection; PGresult *result; bool isUtf8; @@ -231,21 +231,21 @@ void TQPSQLResult::cleanup() d->result = 0; setAt( -1 ); currentSize = 0; - setActive( FALSE ); + setActive( false ); } bool TQPSQLResult::fetch( int i ) { if ( !isActive() ) - return FALSE; + return false; if ( i < 0 ) - return FALSE; + return false; if ( i >= currentSize ) - return FALSE; + return false; if ( at() == i ) - return TRUE; + return true; setAt( i ); - return TRUE; + return true; } bool TQPSQLResult::fetchFirst() @@ -460,10 +460,10 @@ bool TQPSQLResult::reset ( const TQString& query ) { cleanup(); if ( !driver() ) - return FALSE; + return false; if ( !driver()->isOpen() || driver()->isOpenError() ) - return FALSE; - setActive( FALSE ); + return false; + setActive( false ); setAt( TQSql::BeforeFirst ); if ( d->result ) PQclear( d->result ); @@ -475,17 +475,17 @@ bool TQPSQLResult::reset ( const TQString& query ) int status = PQresultStatus( d->result ); if ( status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK ) { if ( status == PGRES_TUPLES_OK ) { - setSelect( TRUE ); + setSelect( true ); currentSize = PQntuples( d->result ); } else { - setSelect( FALSE ); + setSelect( false ); currentSize = -1; } - setActive( TRUE ); - return TRUE; + setActive( true ); + return true; } setLastError( qMakeError( "Unable to create query", TQSqlError::Statement, d ) ); - return FALSE; + return false; } int TQPSQLResult::size() @@ -527,7 +527,7 @@ static TQPSQLDriver::Protocol getPSQLVersion( PGconn* connection ) TQString val( PQgetvalue( result, 0, 0 ) ); PQclear( result ); TQRegExp rx( "(\\d+)\\.(\\d+)" ); - rx.setMinimal ( TRUE ); // enforce non-greedy RegExp + rx.setMinimal ( true ); // enforce non-greedy RegExp if ( rx.search( val ) != -1 ) { int vMaj = rx.cap( 1 ).toInt(); int vMin = rx.cap( 2 ).toInt(); @@ -569,8 +569,8 @@ TQPSQLDriver::TQPSQLDriver( PGconn * conn, TQObject * parent, const char * name d->connection = conn; if ( conn ) { pro = getPSQLVersion( d->connection ); - setOpen( TRUE ); - setOpenError( FALSE ); + setOpen( true ); + setOpenError( false ); } } @@ -607,15 +607,15 @@ bool TQPSQLDriver::hasFeature( DriverFeature f ) const { switch ( f ) { case Transactions: - return TRUE; + return true; case QuerySize: - return TRUE; + return true; case BLOB: return pro >= TQPSQLDriver::Version71; case Unicode: return d->isUtf8; default: - return FALSE; + return false; } } @@ -626,7 +626,7 @@ bool TQPSQLDriver::open( const TQString&, int ) { tqWarning("TQPSQLDriver::open(): This version of open() is no longer supported." ); - return FALSE; + return false; } bool TQPSQLDriver::open( const TQString & db, @@ -657,17 +657,17 @@ 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 ) ); - setOpenError( TRUE ); - return FALSE; + setOpenError( true ); + return false; } pro = getPSQLVersion( d->connection ); d->isUtf8 = setEncodingUtf8( d->connection ); setDatestyle( d->connection ); - setOpen( TRUE ); - setOpenError( FALSE ); - return TRUE; + setOpen( true ); + setOpenError( false ); + return true; } void TQPSQLDriver::close() @@ -676,15 +676,15 @@ void TQPSQLDriver::close() if (d->connection) PQfinish( d->connection ); d->connection = 0; - setOpen( FALSE ); - setOpenError( FALSE ); + setOpen( false ); + setOpenError( false ); } } bool TQPSQLDriver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } PGresult *res = NULL; @@ -698,10 +698,10 @@ bool TQPSQLDriver::ping() PQreset( d->connection ); if ( PQstatus( d->connection ) != CONNECTION_OK ) { setLastError( qMakeError("Unable to execute ping", TQSqlError::Statement, d ) ); - return FALSE; + return false; } } - return TRUE; + return true; } TQSqlQuery TQPSQLDriver::createQuery() const @@ -715,16 +715,16 @@ bool TQPSQLDriver::beginTransaction() #ifdef QT_CHECK_RANGE tqWarning( "TQPSQLDriver::beginTransaction: Database not open" ); #endif - return FALSE; + return false; } PGresult* res = PQexec( d->connection, "BEGIN" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { PQclear( res ); setLastError( qMakeError( "Could not begin transaction", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } PQclear( res ); - return TRUE; + return true; } bool TQPSQLDriver::commitTransaction() @@ -733,16 +733,16 @@ bool TQPSQLDriver::commitTransaction() #ifdef QT_CHECK_RANGE tqWarning( "TQPSQLDriver::commitTransaction: Database not open" ); #endif - return FALSE; + return false; } PGresult* res = PQexec( d->connection, "COMMIT" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { PQclear( res ); setLastError( qMakeError( "Could not commit transaction", TQSqlError::Transaction, d ) ); - return FALSE; + return false; } PQclear( res ); - return TRUE; + return true; } bool TQPSQLDriver::rollbackTransaction() @@ -751,16 +751,16 @@ bool TQPSQLDriver::rollbackTransaction() #ifdef QT_CHECK_RANGE tqWarning( "TQPSQLDriver::rollbackTransaction: Database not open" ); #endif - return FALSE; + return false; } PGresult* res = PQexec( d->connection, "ROLLBACK" ); if ( !res || PQresultStatus( res ) != PGRES_COMMAND_OK ) { setLastError( qMakeError( "Could not rollback transaction", TQSqlError::Transaction, d ) ); PQclear( res ); - return FALSE; + return false; } PQclear( res ); - return TRUE; + return true; } TQStringList TQPSQLDriver::tables( const TQString& typeName ) const @@ -770,7 +770,7 @@ TQStringList TQPSQLDriver::tables( const TQString& typeName ) const return tl; int type = typeName.toInt(); TQSqlQuery t = createQuery(); - t.setForwardOnly( TRUE ); + t.setForwardOnly( true ); if ( typeName.isEmpty() || ((type & (int)TQSql::Tables) == (int)TQSql::Tables) ) { @@ -1127,7 +1127,7 @@ TQString TQPSQLDriver::formatValue( const TQSqlField* field, r += uc; } else { r += "\\\\"; - r += TQString::number( (unsigned char) ba[ i ], 8 ).rightJustify( 3, '0', TRUE ); + r += TQString::number( (unsigned char) ba[ i ], 8 ).rightJustify( 3, '0', true ); } } r += "'"; diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp index de7fde7e2..a0e78db91 100644 --- a/src/sql/drivers/sqlite/tqsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp @@ -82,7 +82,7 @@ public: static const uint initial_cache_size = 128; TQSQLiteResultPrivate::TQSQLiteResultPrivate(TQSQLiteResult* res) : q(res), access(0), currentTail(0), - currentMachine(0), skippedStatus(FALSE), skipRow(0), utf8(FALSE) + currentMachine(0), skippedStatus(false), skipRow(0), utf8(false) { } @@ -92,11 +92,11 @@ void TQSQLiteResultPrivate::cleanup() rInf.clear(); currentTail = 0; currentMachine = 0; - skippedStatus = FALSE; + skippedStatus = false; delete skipRow; skipRow = 0; q->setAt(TQSql::BeforeFirst); - q->setActive(FALSE); + q->setActive(false); q->cleanup(); } @@ -155,7 +155,7 @@ bool TQSQLiteResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row) } if (!currentMachine) - return FALSE; + return false; // keep trying while busy, wish I could implement this better. while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) { @@ -174,27 +174,27 @@ bool TQSQLiteResultPrivate::fetchNext(TQtSqlCachedResult::RowCache* row) // must be first call. init(cnames, colNum, &row); if (!fvals) - return FALSE; + return false; if (!row) - return TRUE; + return true; for (i = 0; i < colNum; ++i) (*row)[i] = utf8 ? TQString::fromUtf8(fvals[i]) : TQString(fvals[i]); - return TRUE; + return true; case SQLITE_DONE: if (rInf.isEmpty()) // must be first call. init(cnames, colNum); q->setAt(TQSql::AfterLast); - return FALSE; + return false; case SQLITE_ERROR: case SQLITE_MISUSE: default: // something wrong, don't get col info, but still return false finalize(); // finalize to get the error message. q->setAt(TQSql::AfterLast); - return FALSE; + return false; } - return FALSE; + return false; } TQSQLiteResult::TQSQLiteResult(const TQSQLiteDriver* db) @@ -218,14 +218,14 @@ bool TQSQLiteResult::reset (const TQString& query) { // this is where we build a query. if (!driver()) - return FALSE; + return false; if (!driver()-> isOpen() || driver()->isOpenError()) - return FALSE; + return false; d->cleanup(); // Um, ok. callback based so.... pass private static function for this. - setSelect(FALSE); + setSelect(false); char *err = 0; int res = sqlite_compile(d->access, d->utf8 ? (const char*)query.utf8().data() : query.ascii(), @@ -238,8 +238,8 @@ bool TQSQLiteResult::reset (const TQString& query) } //if (*d->currentTail != '\000' then there is more sql to eval if (!d->currentMachine) { - setActive(FALSE); - return FALSE; + setActive(false); + return false; } // we have to fetch one row to find out about // the structure of the result set @@ -247,8 +247,8 @@ bool TQSQLiteResult::reset (const TQString& query) setSelect(!d->rInf.isEmpty()); if (isSelect()) init(d->rInf.count()); - setActive(TRUE); - return TRUE; + setActive(true); + return true; } bool TQSQLiteResult::gotoNext(TQtSqlCachedResult::RowCache* row) @@ -279,8 +279,8 @@ TQSQLiteDriver::TQSQLiteDriver(sqlite *connection, TQObject *parent, const char { d = new TQSQLiteDriverPrivate(); d->access = connection; - setOpen(TRUE); - setOpenError(FALSE); + setOpen(true); + setOpenError(false); } @@ -293,14 +293,14 @@ bool TQSQLiteDriver::hasFeature(DriverFeature f) const { switch (f) { case Transactions: - return TRUE; + return true; #if (TQT_VERSION-0 >= 0x030000) case Unicode: return d->utf8; #endif // case BLOB: default: - return FALSE; + return false; } } @@ -314,7 +314,7 @@ bool TQSQLiteDriver::open(const TQString & db, const TQString &, const TQString close(); if (db.isEmpty()) - return FALSE; + return false; char* err = 0; d->access = sqlite_open(TQFile::encodeName(db), 0, &err); @@ -325,12 +325,12 @@ bool TQSQLiteDriver::open(const TQString & db, const TQString &, const TQString } if (d->access) { - setOpen(TRUE); - setOpenError(FALSE); - return TRUE; + setOpen(true); + setOpenError(false); + return true; } - setOpenError(TRUE); - return FALSE; + setOpenError(true); + return false; } void TQSQLiteDriver::close() @@ -338,20 +338,20 @@ void TQSQLiteDriver::close() if (isOpen()) { sqlite_close(d->access); d->access = 0; - setOpen(FALSE); - setOpenError(FALSE); + setOpen(false); + setOpenError(false); } } bool TQSQLiteDriver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } // FIXME // Implement ping if available - return TRUE; + return true; } TQSqlQuery TQSQLiteDriver::createQuery() const @@ -362,49 +362,49 @@ TQSqlQuery TQSQLiteDriver::createQuery() const bool TQSQLiteDriver::beginTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; char* err; int res = sqlite_exec(d->access, "BEGIN", 0, this, &err); if (res == SQLITE_OK) - return TRUE; + return true; setLastError(TQSqlError("Unable to begin transaction", err, TQSqlError::Transaction, res)); sqlite_freemem(err); - return FALSE; + return false; } bool TQSQLiteDriver::commitTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; char* err; int res = sqlite_exec(d->access, "COMMIT", 0, this, &err); if (res == SQLITE_OK) - return TRUE; + return true; setLastError(TQSqlError("Unable to commit transaction", err, TQSqlError::Transaction, res)); sqlite_freemem(err); - return FALSE; + return false; } bool TQSQLiteDriver::rollbackTransaction() { if (!isOpen() || isOpenError()) - return FALSE; + return false; char* err; int res = sqlite_exec(d->access, "ROLLBACK", 0, this, &err); if (res == SQLITE_OK) - return TRUE; + return true; setLastError(TQSqlError("Unable to rollback Transaction", err, TQSqlError::Transaction, res)); sqlite_freemem(err); - return FALSE; + return false; } TQStringList TQSQLiteDriver::tables(const TQString &typeName) const @@ -415,7 +415,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const int type = typeName.toInt(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); #if (TQT_VERSION-0 >= 0x030000) if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views)) q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'"); @@ -451,7 +451,7 @@ TQSqlIndex TQSQLiteDriver::primaryIndex(const TQString &tblname) const return TQSqlIndex(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); // finrst find a UNIQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; @@ -483,7 +483,7 @@ TQSqlRecordInfo TQSQLiteDriver::recordInfo(const TQString &tbl) const return TQSqlRecordInfo(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT * FROM " + tbl + " LIMIT 1"); return recordInfo(q); } diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp index f75feaa1b..a3ce63e35 100644 --- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp +++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp @@ -331,12 +331,12 @@ void TQSQLite3Driver::close() bool TQSQLite3Driver::ping() { if ( !isOpen() ) { - return FALSE; + return false; } // FIXME // Implement ping if available - return TRUE; + return true; } TQSqlQuery TQSQLite3Driver::createQuery() const @@ -397,7 +397,7 @@ TQStringList TQSQLite3Driver::tables(const TQString &typeName) const int type = typeName.toInt(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); #if (TQT_VERSION-0 >= 0x030200) if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views)) q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'"); @@ -433,7 +433,7 @@ TQSqlIndex TQSQLite3Driver::primaryIndex(const TQString &tblname) const return TQSqlIndex(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); // finrst find a UNIQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; @@ -465,7 +465,7 @@ TQSqlRecordInfo TQSQLite3Driver::recordInfo(const TQString &tbl) const return TQSqlRecordInfo(); TQSqlQuery q = createQuery(); - q.setForwardOnly(TRUE); + q.setForwardOnly(true); q.exec("SELECT * FROM " + tbl + " LIMIT 1"); return recordInfo(q); } |