1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSqlQuery coding style: clean up declarations

Browse Source 
Split some long declarations of two variables in one line into two
separate declarations. Made more things const, made some consts
constexpr. Skip a variable entirely when it's only used once (and not
giving us some other benefit). Moved some declarations closer to their
variables' first uses.

Replace some Capitalised variable names with lower-case ones.

Change-Id: I3b8dac46530ba1c2e6100cb007b5487253304526
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2022-02-01 14:47:55 +01:00
parent 915469e4de
commit f8d31aa7de
1 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -318,7 +318,6 @@ void tst_QSqlQuery::cleanup()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if ( QTest::currentTestFunction() == QLatin1String( "numRowsAffected" ) if ( QTest::currentTestFunction() == QLatin1String( "numRowsAffected" )
|| QTest::currentTestFunction() == QLatin1String( "transactions" ) || QTest::currentTestFunction() == QLatin1String( "transactions" )
|| QTest::currentTestFunction() == QLatin1String( "size" ) || QTest::currentTestFunction() == QLatin1String( "size" )
@ -327,8 +326,9 @@ void tst_QSqlQuery::cleanup()
populateTestTables( db ); populateTestTables( db );
} }
if (QTest::currentTestFailed() && (dbType == QSqlDriver::Oracle || db.driverName().startsWith("QODBC"))) { if (QTest::currentTestFailed() && (tst_Databases::getDatabaseType(db) == QSqlDriver::Oracle
//since Oracle ODBC totally craps out on error, we init again || db.driverName().startsWith("QODBC"))) {
// Since Oracle ODBC totally craps out on error, we init again:
db.close(); db.close();
db.open(); db.open();
} }
@ -476,8 +476,7 @@ void tst_QSqlQuery::char1Select()
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values ('a')").arg(tbl))); QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values ('a')").arg(tbl)));
QVERIFY_SQL(q, exec("select * from " + tbl)); QVERIFY_SQL(q, exec("select * from " + tbl));
QVERIFY( q.next() ); QVERIFY( q.next() );
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); if (tst_Databases::getDatabaseType(db) == QSqlDriver::Interbase)
if (dbType == QSqlDriver::Interbase)
QCOMPARE(q.value(0).toString().left(1), u"a"); QCOMPARE(q.value(0).toString().left(1), u"a");
else else
QCOMPARE(q.value(0).toString(), u"a"); QCOMPARE(q.value(0).toString(), u"a");
@ -585,7 +584,8 @@ void tst_QSqlQuery::mysql_outValues()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
const QString hello(qTableName("hello", __FILE__, db)), qtestproc(qTableName("qtestproc", __FILE__, db)); const QString hello(qTableName("hello", __FILE__, db));
const QString qtestproc(qTableName("qtestproc", __FILE__, db));
QSqlQuery q( db ); QSqlQuery q( db );
@ -1004,8 +1004,8 @@ void tst_QSqlQuery::outValues()
void tst_QSqlQuery::blob() void tst_QSqlQuery::blob()
{ {
static const int BLOBSIZE = 1024 * 10; constexpr int BLOBSIZE = 1024 * 10;
static const int BLOBCOUNT = 2; constexpr int BLOBCOUNT = 2;
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
@ -1015,7 +1015,7 @@ void tst_QSqlQuery::blob()
QSKIP( "DBMS not BLOB capable"); QSKIP( "DBMS not BLOB capable");
//don' make it too big otherwise sybase and mysql will complain //don' make it too big otherwise sybase and mysql will complain
QByteArray ba( BLOBSIZE, 0 ); QByteArray ba(BLOBSIZE, Qt::Uninitialized);
for (int i = 0; i < ba.size(); ++i) for (int i = 0; i < ba.size(); ++i)
ba[i] = i % 256; ba[i] = i % 256;
@ -1141,8 +1141,7 @@ void tst_QSqlQuery::record()
QCOMPARE(q.record().fieldName(0).toLower(), u"id"); QCOMPARE(q.record().fieldName(0).toLower(), u"id");
QCOMPARE( q.value( 0 ).toInt(), 2 ); QCOMPARE( q.value( 0 ).toInt(), 2 );
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); if (tst_Databases::getDatabaseType(db) == QSqlDriver::Oracle)
if (dbType == QSqlDriver::Oracle)
QSKIP("Getting the tablename is not supported in Oracle"); QSKIP("Getting the tablename is not supported in Oracle");
const auto lowerQTest = qtest.toLower(); const auto lowerQTest = qtest.toLower();
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
@ -1580,8 +1579,6 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db); CHECK_DATABASE(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (!db.driver()->hasFeature(QSqlDriver::MultipleResultSets)) if (!db.driver()->hasFeature(QSqlDriver::MultipleResultSets))
QSKIP("DBMS doesn't support multiple result sets"); QSKIP("DBMS doesn't support multiple result sets");
@ -1610,8 +1607,10 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QCOMPARE(record.count(), 2); QCOMPARE(record.count(), 2);
QCOMPARE(record.indexOf("id"), 0); QCOMPARE(record.indexOf("id"), 0);
QCOMPARE(record.indexOf("t_varchar"), 1); QCOMPARE(record.indexOf("t_varchar"), 1);
if (dbType != QSqlDriver::PostgreSQL) { // tableName() is not available in forward-only mode of QPSQL // tableName() is not available in forward-only mode of QPSQL
QCOMPARE(record.field(0).tableName(), qtest); // BUG: This fails for Microsoft SQL Server 2016 (QODBC), need fix if (tst_Databases::getDatabaseType(db) != QSqlDriver::PostgreSQL) {
// BUG: This fails for Microsoft SQL Server 2016 (QODBC), need fix:
QCOMPARE(record.field(0).tableName(), qtest);
QCOMPARE(record.field(1).tableName(), qtest); QCOMPARE(record.field(1).tableName(), qtest);
} }
@ -2168,7 +2167,8 @@ void tst_QSqlQuery::joins()
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
const QString qtestj1(qTableName("qtestj1", __FILE__, db)), qtestj2(qTableName("qtestj2", __FILE__, db)); const QString qtestj1(qTableName("qtestj1", __FILE__, db));
const QString qtestj2(qTableName("qtestj2", __FILE__, db));
if (dbType == QSqlDriver::Oracle || dbType == QSqlDriver::Sybase if (dbType == QSqlDriver::Oracle || dbType == QSqlDriver::Sybase
|| dbType == QSqlDriver::Interbase || db.driverName().startsWith("QODBC")) { || dbType == QSqlDriver::Interbase || db.driverName().startsWith("QODBC")) {
@ -2603,9 +2603,7 @@ void tst_QSqlQuery::sqlServerLongStrings()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType != QSqlDriver::MSSqlServer)
QSKIP( "SQL Server specific test"); QSKIP( "SQL Server specific test");
QSqlQuery q( db ); QSqlQuery q( db );
@ -3027,9 +3025,7 @@ void tst_QSqlQuery::lastInsertId()
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (41, 'VarChar41', 'Char41')") QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (41, 'VarChar41', 'Char41')")
.arg(qtest))); .arg(qtest)));
} }
QVariant v = q.lastInsertId(); QVERIFY(q.lastInsertId().isValid());
QVERIFY( v.isValid() );
} }
void tst_QSqlQuery::lastQuery() void tst_QSqlQuery::lastQuery()
@ -3650,21 +3646,21 @@ void tst_QSqlQuery::task_217003()
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
QSqlQuery q( db ); QSqlQuery q( db );
const QString Planet(qTableName( "Planet", __FILE__, db)); const QString planets = qTableName("Planet", __FILE__, db);
q.exec("drop table " + Planet); q.exec("drop table " + planets);
QVERIFY_SQL(q, exec(QLatin1String("create table %1 (Name varchar(20))").arg(Planet))); QVERIFY_SQL(q, exec(QLatin1String("create table %1 (Name varchar(20))").arg(planets)));
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mercury')").arg(Planet))); QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mercury')").arg(planets)));
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Venus')").arg(Planet))); QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Venus')").arg(planets)));
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Earth')").arg(Planet))); QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Earth')").arg(planets)));
QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mars')").arg(Planet))); QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mars')").arg(planets)));
QVERIFY_SQL( q, exec( "SELECT Name FROM " + Planet ) ); QVERIFY_SQL(q, exec("SELECT Name FROM " + planets));
QVERIFY_SQL( q, seek( 3 ) ); QVERIFY_SQL( q, seek( 3 ) );
QCOMPARE(q.value(0).toString(), u"Mars"); QCOMPARE(q.value(0).toString(), u"Mars");
QVERIFY_SQL( q, seek( 1 ) ); QVERIFY_SQL( q, seek( 1 ) );
QCOMPARE(q.value(0).toString(), u"Venus"); QCOMPARE(q.value(0).toString(), u"Venus");
QVERIFY_SQL( q, exec( "SELECT Name FROM " + Planet ) ); QVERIFY_SQL(q, exec("SELECT Name FROM " + planets));
QVERIFY_SQL( q, seek( 3 ) ); QVERIFY_SQL( q, seek( 3 ) );
QCOMPARE(q.value(0).toString(), u"Mars"); QCOMPARE(q.value(0).toString(), u"Mars");
QVERIFY_SQL( q, seek( 0 ) ); QVERIFY_SQL( q, seek( 0 ) );
@ -3783,11 +3779,11 @@ void tst_QSqlQuery::sqlServerReturn0()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
if (dbType != QSqlDriver::MSSqlServer)
QSKIP("SQL Server specific test"); QSKIP("SQL Server specific test");
const QString tableName(qTableName("test141895", __FILE__, db)), procName(qTableName("test141895_proc", __FILE__, db)); const QString tableName(qTableName("test141895", __FILE__, db));
const QString procName(qTableName("test141895_proc", __FILE__, db));
QSqlQuery q( db ); QSqlQuery q( db );
q.exec("DROP TABLE " + tableName); q.exec("DROP TABLE " + tableName);
q.exec("DROP PROCEDURE " + procName); q.exec("DROP PROCEDURE " + procName);
@ -3829,24 +3825,23 @@ void tst_QSqlQuery::QTBUG_551()
" END p;\n" " END p;\n"
"END %1;").arg(pkgname))); "END %1;").arg(pkgname)));
QVariantList inLst, outLst, res_outLst;
q.prepare(QLatin1String("begin %1.p(:inp, :outp); end;").arg(pkgname)); q.prepare(QLatin1String("begin %1.p(:inp, :outp); end;").arg(pkgname));
QString StVal; QString text;
StVal.reserve(60); text.reserve(60);
// loading arrays // loading arrays
for (int Cnt=0; Cnt < 3; Cnt++) { QVariantList inLst, outLst;
inLst << Cnt; for (int count = 0; count < 3; ++count) {
outLst << StVal; inLst << count;
outLst << text;
} }
q.bindValue(":inp", inLst); q.bindValue(":inp", inLst);
q.bindValue(":outp", outLst, QSql::Out); q.bindValue(":outp", outLst, QSql::Out);
QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns) ); QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns) );
res_outLst = qvariant_cast<QVariantList>(q.boundValues().at(1)); const auto res_outLst = qvariant_cast<QVariantList>(q.boundValues().at(1));
QCOMPARE(res_outLst[0].toString(), QLatin1String("1. Value is 0")); QCOMPARE(res_outLst[0].toString(), QLatin1String("1. Value is 0"));
QCOMPARE(res_outLst[1].toString(), QLatin1String("2. Value is 1")); QCOMPARE(res_outLst[1].toString(), QLatin1String("2. Value is 1"));
@ -3984,8 +3979,7 @@ void tst_QSqlQuery::QTBUG_6618()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
if (dbType != QSqlDriver::MSSqlServer)
QSKIP("SQL Server specific test"); QSKIP("SQL Server specific test");
QSqlQuery q(db); QSqlQuery q(db);
@ -4009,7 +4003,8 @@ void tst_QSqlQuery::QTBUG_6852()
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
QSqlQuery q(db); QSqlQuery q(db);
const QString tableName(qTableName("bug6852", __FILE__, db)), procName(qTableName("bug6852_proc", __FILE__, db)); const QString tableName(qTableName("bug6852", __FILE__, db));
const QString procName(qTableName("bug6852_proc", __FILE__, db));
QVERIFY_SQL(q, exec("DROP PROCEDURE IF EXISTS " + procName)); QVERIFY_SQL(q, exec("DROP PROCEDURE IF EXISTS " + procName));
QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1(\n" QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1(\n"
@ -4499,9 +4494,7 @@ void tst_QSqlQuery::sqlite_constraint()
QFETCH( QString, dbName ); QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName ); QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db ); CHECK_DATABASE( db );
if (tst_Databases::getDatabaseType(db) != QSqlDriver::SQLite)
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType != QSqlDriver::SQLite)
QSKIP("Sqlite3 specific test"); QSKIP("Sqlite3 specific test");
QSqlQuery q(db); QSqlQuery q(db);
@ -4759,7 +4752,7 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName,
const T max = std::numeric_limits<T>::max()) const T max = std::numeric_limits<T>::max())
{ {
// insert some values // insert some values
const int steps = 20; constexpr int steps = 20;
const T increment = (max / steps - min / steps); const T increment = (max / steps - min / steps);
QList<T> values; QList<T> values;
values.reserve(steps); values.reserve(steps);
@ -4795,9 +4788,10 @@ void tst_QSqlQuery::integralTypesMysql()
void tst_QSqlQuery::QTBUG_57138() void tst_QSqlQuery::QTBUG_57138()
{ {
QDateTime utc = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::UTC); const QDateTime utc = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::UTC);
QDateTime localtime = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::LocalTime); const QDateTime localtime = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::LocalTime);
QDateTime tzoffset = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::OffsetFromUTC, 3600); const QDateTime tzoffset = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123),
Qt::OffsetFromUTC, 3600);
QFETCH(QString, dbName); QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
@ -4949,9 +4943,7 @@ void tst_QSqlQuery::dateTime()
QFETCH(QString, dbName); QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db); CHECK_DATABASE(db);
if (tst_Databases::getDatabaseType(db) != QSqlDriver::Oracle)
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType != QSqlDriver::Oracle)
QSKIP("Implemented only for Oracle"); QSKIP("Implemented only for Oracle");
QFETCH(QString, tableName); QFETCH(QString, tableName);