diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-12-21 21:37:50 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-12-22 19:26:51 +0100 |
| commit | ebd94489a3eaf4c1b3f194df59dc7d53970b59ae (patch) | |
| tree | f591921bc487ca6ae669d3296a9a1d248f7dc3be /tests/auto/sql/kernel/qsqldatabase/tst_databases.h | |
| parent | 35f9f2bb0014de4a64d5d442ed2a601821dd0ee3 (diff) | |
SQL: remove unneeded test functions
testWhiteSpaceNames() returns true for all current database drivers so
it's useless and can be removed. safeDropView() and getPSQLVersion()
is not called anywhere, getMySqlVersion() is only used for a check for a
MySql version we no longer support.
Change-Id: I8d02f17f475821e81d309ee96897e772cdfb895d
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'tests/auto/sql/kernel/qsqldatabase/tst_databases.h')
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_databases.h | 58 |
1 files changed, 8 insertions, 50 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h index 93906934be4..7b4961256b7 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h +++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h @@ -79,15 +79,6 @@ inline static QString qTableName(const QString& prefix, QSqlDatabase db) qGetHostName(), QSqlDriver::TableName)),db); } -inline static bool testWhiteSpaceNames( const QString &name ) -{ -/* return name.startsWith( "QPSQL" ) - || name.startsWith( "QODBC" ) - || name.startsWith( "QSQLITE" ) - || name.startsWith( "QMYSQL" );*/ - return name != QLatin1String("QSQLITE2"); -} - inline static QString toHex( const QString& binary ) { QString str; @@ -397,11 +388,6 @@ public: } } - static void safeDropView( QSqlDatabase db, const QString& tableName ) - { - safeDropViews(db, QStringList() << tableName); - } - // returns the type name of the blob datatype for the database db. // blobSize is only used if the db doesn't have a generic blob type static QString blobTypeName( QSqlDatabase db, int blobSize = 10000 ) @@ -476,34 +462,26 @@ public: return QString(); } - static QByteArray printError( const QSqlError& err ) + static QByteArray printError(const QSqlError &err) { QString result; if (!err.nativeErrorCode().isEmpty()) - result += '(' + err.nativeErrorCode() + ") "; - result += '\''; - if(!err.driverText().isEmpty()) + result += u'(' + err.nativeErrorCode() + ") "; + result += u'\''; + if (!err.driverText().isEmpty()) result += err.driverText() + "' || '"; - result += err.databaseText() + QLatin1Char('\''); + result += err.databaseText() + u'\''; return result.toLocal8Bit(); } - static QByteArray printError( const QSqlError& err, const QSqlDatabase& db ) + static QByteArray printError(const QSqlError &err, const QSqlDatabase &db) { - QString result(dbToString(db) + ": "); - if (!err.nativeErrorCode().isEmpty()) - result += '(' + err.nativeErrorCode() + ") "; - result += '\''; - if(!err.driverText().isEmpty()) - result += err.driverText() + "' || '"; - result += err.databaseText() + QLatin1Char('\''); - return result.toLocal8Bit(); + return dbToString(db).toLocal8Bit() + ": " + printError(err); } static QSqlDriver::DbmsType getDatabaseType(QSqlDatabase db) { - QSqlDriverPrivate *d = static_cast<QSqlDriverPrivate *>(QObjectPrivate::get(db.driver())); - return d->dbmsType; + return db.driver()->dbmsType(); } static bool isMSAccess( QSqlDatabase db ) @@ -531,26 +509,6 @@ public: return ver; } - static QString getMySqlVersion( const QSqlDatabase &db ) - { - QSqlQuery q(db); - q.exec( "select version()" ); - if(q.next()) - return q.value( 0 ).toString(); - else - return QString(); - } - - static QString getPSQLVersion( const QSqlDatabase &db ) - { - QSqlQuery q(db); - q.exec( "select version()" ); - if(q.next()) - return q.value( 0 ).toString(); - else - return QString(); - } - QStringList dbNames; int counter; |