summaryrefslogtreecommitdiffstats
path: root/tests/auto/sql
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/sql')
-rw-r--r--tests/auto/sql/kernel/qsql/tst_qsql.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/tst_databases.h29
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp4665
-rw-r--r--tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqlresult/testsqldriver.h29
-rw-r--r--tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp29
-rw-r--r--tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp29
-rw-r--r--tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp29
-rw-r--r--tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp29
-rw-r--r--tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp29
-rw-r--r--tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp29
15 files changed, 2387 insertions, 2684 deletions
diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index a8eca14f49..1d6b271f44 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 74fa06ab29..5b0283d285 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
/* possible connection parameters */
#ifndef TST_DATABASES_H
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 0ef4caeafa..2e143aff21 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 70e5b43845..3a6e16020f 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index ab7489a145..c83867fcc4 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
index 09e33cebee..79c774630d 100644
--- a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index d7a4e8840c..026c9becec 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2022 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
#include <QtSql/QtSql>
@@ -33,6 +8,8 @@
#include "../qsqldatabase/tst_databases.h"
+using namespace Qt::StringLiterals;
+
QString qtest;
class tst_QSqlQuery : public QObject
@@ -41,12 +18,10 @@ class tst_QSqlQuery : public QObject
public:
tst_QSqlQuery();
- virtual ~tst_QSqlQuery();
public slots:
void initTestCase();
void cleanupTestCase();
- void init();
void cleanup();
private slots:
@@ -70,8 +45,6 @@ private slots:
void query_exec();
void execErrorRecovery_data() { generic_data(); }
void execErrorRecovery();
- void prematureExec_data() { generic_data(); }
- void prematureExec();
void first_data() { generic_data(); }
void first();
void next_data() { generic_data(); }
@@ -103,7 +76,7 @@ private slots:
void psql_forwardOnlyQueryResultsLost_data() { generic_data("QPSQL"); }
void psql_forwardOnlyQueryResultsLost();
- // bug specific tests
+ // Bug-specific tests:
void tds_bitField_data() { generic_data("QTDS"); }
void tds_bitField();
void oci_nullBlob_data() { generic_data("QOCI"); }
@@ -229,9 +202,9 @@ private slots:
void QTBUG_21884_data() { generic_data("QSQLITE"); }
void QTBUG_21884();
void QTBUG_16967_data() { generic_data("QSQLITE"); }
- void QTBUG_16967(); //clean close
+ void QTBUG_16967(); // clean close
void QTBUG_23895_data() { generic_data("QSQLITE"); }
- void QTBUG_23895(); //sqlite boolean type
+ void QTBUG_23895(); // sqlite boolean type
void QTBUG_14904_data() { generic_data("QSQLITE"); }
void QTBUG_14904();
@@ -271,12 +244,16 @@ private slots:
void ibaseArray_data() { generic_data("QIBASE"); }
void ibaseArray();
+ // Double addDatabase() with same name leaves system in a state that breaks
+ // invalidQuery() if run later; so put this one last !
+ void prematureExec_data() { generic_data(); }
+ void prematureExec();
private:
// returns all database connections
void generic_data(const QString &engine=QString());
- void dropTestTables( QSqlDatabase db );
- void createTestTables( QSqlDatabase db );
- void populateTestTables( QSqlDatabase db );
+ void dropTestTables(QSqlDatabase db);
+ void createTestTables(QSqlDatabase db);
+ void populateTestTables(QSqlDatabase db);
tst_Databases dbs;
};
@@ -287,76 +264,70 @@ tst_QSqlQuery::tst_QSqlQuery()
qtest = qTableName("qtest", __FILE__, static_qtest_db);
}
-tst_QSqlQuery::~tst_QSqlQuery()
-{
-}
-
void tst_QSqlQuery::initTestCase()
{
QVERIFY(dbs.open());
- for ( QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it ) {
- QSqlDatabase db = QSqlDatabase::database(( *it ) );
- CHECK_DATABASE( db );
- dropTestTables( db ); //in case of leftovers
- createTestTables( db );
- populateTestTables( db );
+ for (const QString &name : std::as_const(dbs.dbNames)) {
+ QSqlDatabase db = QSqlDatabase::database(name);
+ CHECK_DATABASE(db);
+ dropTestTables(db); // in case of leftovers
+ createTestTables(db);
+ populateTestTables(db);
}
}
void tst_QSqlQuery::cleanupTestCase()
{
- for ( QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it ) {
- QSqlDatabase db = QSqlDatabase::database(( *it ) );
- CHECK_DATABASE( db );
- dropTestTables( db );
+ for (const QString &name : std::as_const(dbs.dbNames)) {
+ QSqlDatabase db = QSqlDatabase::database(name);
+ CHECK_DATABASE(db);
+ dropTestTables(db);
}
dbs.close();
}
-void tst_QSqlQuery::init()
-{
-}
-
void tst_QSqlQuery::cleanup()
{
if (QTest::currentTestFunction() == QLatin1String("crashQueryOnCloseDatabase"))
return;
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if ( QTest::currentTestFunction() == QLatin1String( "numRowsAffected" )
- || QTest::currentTestFunction() == QLatin1String( "transactions" )
- || QTest::currentTestFunction() == QLatin1String( "size" )
- || QTest::currentTestFunction() == QLatin1String( "isActive" )
- || QTest::currentTestFunction() == QLatin1String( "lastInsertId" ) ) {
- populateTestTables( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ if (QTest::currentTestFunction() == QLatin1String("numRowsAffected")
+ || QTest::currentTestFunction() == QLatin1String("transactions")
+ || QTest::currentTestFunction() == QLatin1String("size")
+ || QTest::currentTestFunction() == QLatin1String("isActive")
+ || QTest::currentTestFunction() == QLatin1String("lastInsertId")) {
+ populateTestTables(db);
}
- if (QTest::currentTestFailed() && (dbType == QSqlDriver::Oracle || db.driverName().startsWith("QODBC"))) {
- //since Oracle ODBC totally craps out on error, we init again
+ if (QTest::currentTestFailed() && (tst_Databases::getDatabaseType(db) == QSqlDriver::Oracle
+ || db.driverName().startsWith("QODBC"))) {
+ // Since Oracle ODBC totally craps out on error, we init again:
db.close();
db.open();
}
}
-void tst_QSqlQuery::generic_data(const QString& engine)
+void tst_QSqlQuery::generic_data(const QString &engine)
{
- if ( dbs.fillTestTable(engine) == 0 ) {
- if(engine.isEmpty())
- QSKIP( "No database drivers are available in this Qt configuration");
- else
- QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
- }
+ if (dbs.fillTestTable(engine))
+ return;
+
+ if (engine.isEmpty())
+ QSKIP("No database drivers are available in this Qt configuration");
+
+ QSKIP(qPrintable(QLatin1String("No database drivers of type %1 "
+ "are available in this Qt configuration").arg(engine)));
}
-void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
+void tst_QSqlQuery::dropTestTables(QSqlDatabase db)
{
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
QStringList tablenames;
- // drop all the table in case a testcase failed
+ // Drop all the table in case a testcase failed:
tablenames << qtest
<< qTableName("qtest_null", __FILE__, db)
<< qTableName("qtest_writenull", __FILE__, db)
@@ -406,250 +377,265 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
db.exec("DROP PROCEDURE " + qTableName("test141895_proc", __FILE__, db));
if (dbType == QSqlDriver::MySqlServer)
- db.exec("DROP PROCEDURE IF EXISTS "+ qTableName("bug6852_proc", __FILE__, db));
+ db.exec("DROP PROCEDURE IF EXISTS " + qTableName("bug6852_proc", __FILE__, db));
- tst_Databases::safeDropTables( db, tablenames );
+ tst_Databases::safeDropTables(db, tablenames);
if (dbType == QSqlDriver::Oracle) {
- QSqlQuery q( db );
+ QSqlQuery q(db);
q.exec("DROP PACKAGE " + qTableName("pkg", __FILE__, db));
}
}
-void tst_QSqlQuery::createTestTables( QSqlDatabase db )
+void tst_QSqlQuery::createTestTables(QSqlDatabase db)
{
- QSqlQuery q( db );
+ QSqlQuery q(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::MySqlServer)
// ### stupid workaround until we find a way to hardcode this
// in the MySQL server startup script
- q.exec( "set table_type=innodb" );
+ q.exec("set table_type=innodb");
else if (dbType == QSqlDriver::PostgreSQL)
- QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
+ QVERIFY_SQL(q, exec("set client_min_messages='warning'"));
- if (dbType == QSqlDriver::PostgreSQL)
- QVERIFY_SQL( q, exec( "create table " + qtest + " (id serial NOT NULL, t_varchar varchar(20), t_char char(20), primary key(id)) WITH OIDS" ) );
- else
- QVERIFY_SQL( q, exec( "create table " + qtest + " (id int "+tst_Databases::autoFieldName(db) +" NOT NULL, t_varchar varchar(20), t_char char(20), primary key(id))" ) );
+ if (dbType == QSqlDriver::PostgreSQL) {
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %1 (id serial NOT NULL, t_varchar varchar(20), "
+ "t_char char(20), primary key(id)) WITH OIDS").arg(qtest)));
+ } else {
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %1 (id int %2 NOT NULL, t_varchar varchar(20), "
+ "t_char char(20), primary key(id))")
+ .arg(qtest, tst_Databases::autoFieldName(db))));
+ }
- if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase)
- QVERIFY_SQL(q, exec("create table " + qTableName("qtest_null", __FILE__, db) + " (id int null, t_varchar varchar(20) null)"));
- else
- QVERIFY_SQL(q, exec("create table " + qTableName("qtest_null", __FILE__, db) + " (id int, t_varchar varchar(20))"));
+ QLatin1String creator(dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase
+ ? "create table %1 (id int null, t_varchar varchar(20) null)"
+ : "create table %1 (id int, t_varchar varchar(20))");
+ QVERIFY_SQL(q, exec(creator.arg(qTableName("qtest_null", __FILE__, db))));
}
-void tst_QSqlQuery::populateTestTables( QSqlDatabase db )
+void tst_QSqlQuery::populateTestTables(QSqlDatabase db)
{
- QSqlQuery q( db );
- const QString qtest_null(qTableName( "qtest_null", __FILE__, db));
- q.exec( "delete from " + qtest );
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (1, 'VarChar1', 'Char1')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (2, 'VarChar2', 'Char2')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (3, 'VarChar3', 'Char3')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (4, 'VarChar4', 'Char4')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (5, 'VarChar5', 'Char5')" ) );
-
- q.exec( "delete from " + qtest_null );
- QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (0, NULL)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (1, 'n')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (2, 'i')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (3, NULL)" ) );
+ QSqlQuery q(db);
+ const QString qtest_null(qTableName("qtest_null", __FILE__, db));
+ q.exec("delete from " + qtest);
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, 'VarChar1', 'Char1')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (2, 'VarChar2', 'Char2')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (3, 'VarChar3', 'Char3')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (4, 'VarChar4', 'Char4')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (5, 'VarChar5', 'Char5')")
+ .arg(qtest)));
+
+ q.exec("delete from " + qtest_null);
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (0, NULL)").arg(qtest_null)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, 'n')").arg(qtest_null)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (2, 'i')").arg(qtest_null)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (3, NULL)").arg(qtest_null)));
}
// There were problems with char fields of size 1
void tst_QSqlQuery::char1Select()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
{
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tbl = qTableName("char1Select", __FILE__, db);
- q.exec( "drop table " + tbl);
- QVERIFY_SQL(q, exec("create table " + tbl + " (id char(1))"));
- QVERIFY_SQL(q, exec("insert into " + tbl + " values ('a')"));
+ q.exec("drop table " + tbl);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id char(1))").arg(tbl)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values ('a')").arg(tbl)));
QVERIFY_SQL(q, exec("select * from " + tbl));
- QVERIFY( q.next() );
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType == QSqlDriver::Interbase)
- QCOMPARE( q.value( 0 ).toString().left( 1 ), QString( "a" ) );
+ QVERIFY(q.next());
+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::Interbase)
+ QCOMPARE(q.value(0).toString().left(1), u"a");
else
- QCOMPARE( q.value( 0 ).toString(), QString( "a" ) );
+ QCOMPARE(q.value(0).toString(), u"a");
- QVERIFY( !q.next() );
+ QVERIFY(!q.next());
}
}
void tst_QSqlQuery::char1SelectUnicode()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::DB2)
QSKIP("Needs someone with more Unicode knowledge than I have to fix");
- if ( db.driver()->hasFeature( QSqlDriver::Unicode ) ) {
- QString uniStr( QChar(0x0915) ); // DEVANAGARI LETTER KA
- QSqlQuery q( db );
- QString createQuery;
- const QString char1SelectUnicode(qTableName("char1SU", __FILE__, db));
-
- if (dbType == QSqlDriver::MSSqlServer)
- createQuery = "create table " + char1SelectUnicode + "(id nchar(1))";
- else if (dbType == QSqlDriver::DB2 || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::PostgreSQL)
- createQuery = "create table " + char1SelectUnicode + " (id char(3))";
- else if (dbType == QSqlDriver::Interbase)
- createQuery = "create table " + char1SelectUnicode +
- " (id char(1) character set unicode_fss)";
- else if (dbType == QSqlDriver::MySqlServer)
- createQuery = "create table " + char1SelectUnicode + " (id char(1)) "
- "default character set 'utf8'";
- else
- createQuery = "create table " + char1SelectUnicode + " (id char(1))";
-
- QVERIFY_SQL( q, exec( createQuery ) );
-
- QVERIFY_SQL( q, prepare( "insert into " + char1SelectUnicode + " values(?)" ) );
-
- q.bindValue( 0, uniStr );
+ if (!db.driver()->hasFeature(QSqlDriver::Unicode))
+ QSKIP("Database not unicode capable");
- QVERIFY_SQL( q, exec() );
-
- QVERIFY_SQL( q, exec( "select * from " + char1SelectUnicode ) );
+ QString uniStr(QChar(0x0915)); // DEVANAGARI LETTER KA
+ QSqlQuery q(db);
+ QLatin1String createQuery;
+ const QString char1SelectUnicode(qTableName("char1SU", __FILE__, db));
+
+ switch (dbType) {
+ case QSqlDriver::MSSqlServer:
+ createQuery = QLatin1String("create table %1(id nchar(1))");
+ break;
+ case QSqlDriver::DB2:
+ case QSqlDriver::Oracle:
+ case QSqlDriver::PostgreSQL:
+ createQuery = QLatin1String("create table %1 (id char(3))");
+ break;
+ case QSqlDriver::Interbase:
+ createQuery = QLatin1String("create table %1 (id char(1) character set unicode_fss)");
+ break;
+ case QSqlDriver::MySqlServer:
+ createQuery = QLatin1String("create table %1 (id char(1)) default character set 'utf8'");
+ break;
+ default:
+ createQuery = QLatin1String("create table %1 (id char(1))");
+ break;
+ }
- QVERIFY( q.next() );
+ QVERIFY_SQL(q, exec(createQuery.arg(char1SelectUnicode)));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 values(?)").arg(char1SelectUnicode)));
- if ( !q.value( 0 ).toString().isEmpty() )
- QCOMPARE( q.value( 0 ).toString()[ 0 ].unicode(), uniStr[0].unicode() );
+ q.bindValue(0, uniStr);
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, exec("select * from " + char1SelectUnicode));
- QCOMPARE( q.value( 0 ).toString().trimmed(), uniStr );
+ QVERIFY(q.next());
+ if (!q.value(0).toString().isEmpty())
+ QCOMPARE(q.value(0).toString()[0].unicode(), uniStr[0].unicode());
- QVERIFY( !q.next() );
- }
- else
- QSKIP( "Database not unicode capable");
+ QCOMPARE(q.value(0).toString().trimmed(), uniStr);
+ QVERIFY(!q.next());
}
void tst_QSqlQuery::oraRowId()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString oraRowId(qTableName("oraRowId", __FILE__, db));
- QSqlQuery q( db );
- QVERIFY_SQL( q, exec( "select rowid from " + qtest ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).metaType().id(), QMetaType::QString );
- QVERIFY( !q.value( 0 ).toString().isEmpty() );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec("select rowid from " + qtest));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).metaType().id(), QMetaType::QString);
+ QVERIFY(!q.value(0).toString().isEmpty());
- QVERIFY_SQL( q, exec( "create table " + oraRowId + " (id char(1))" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id char(1))").arg(oraRowId)));
- QVERIFY_SQL( q, exec( "insert into " + oraRowId + " values('a')" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values('a')").arg(oraRowId)));
QVariant v1 = q.lastInsertId();
- QVERIFY( v1.isValid() );
+ QVERIFY(v1.isValid());
- QVERIFY_SQL( q, exec( "insert into " + oraRowId + " values('b')" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values('b')").arg(oraRowId)));
QVariant v2 = q.lastInsertId();
- QVERIFY( v2.isValid() );
-
- QVERIFY_SQL( q, prepare( "select * from " + oraRowId + " where rowid = ?" ) );
- q.addBindValue( v1 );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toString(), QString( "a" ) );
-
- q.addBindValue( v2 );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toString(), QString( "b" ) );
+ QVERIFY(v2.isValid());
+
+ QVERIFY_SQL(q, prepare(QLatin1String("select * from %1 where rowid = ?").arg(oraRowId)));
+ q.addBindValue(v1);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toString(), u"a");
+
+ q.addBindValue(v2);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toString(), u"b");
}
void tst_QSqlQuery::mysql_outValues()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- const QString hello(qTableName("hello", __FILE__, db)), qtestproc(qTableName("qtestproc", __FILE__, db));
-
- QSqlQuery q( db );
-
- q.exec( "drop function " + hello );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ const QString hello(qTableName("hello", __FILE__, db));
+ const QString qtestproc(qTableName("qtestproc", __FILE__, db));
- QVERIFY_SQL(q, exec("create function " + hello + " (s char(20)) returns varchar(50) READS SQL DATA return concat('Hello ', s)"));
+ QSqlQuery q(db);
- QVERIFY_SQL( q, exec( "select " + hello + "('world')" ) );
- QVERIFY_SQL( q, next() );
+ q.exec("drop function " + hello);
- QCOMPARE( q.value( 0 ).toString(), QString( "Hello world" ) );
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create function %1 (s char(20)) returns varchar(50) "
+ "READS SQL DATA return concat('Hello ', s)").arg(hello)));
- QVERIFY_SQL( q, prepare( "select " + hello + "('harald')" ) );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
+ QVERIFY_SQL(q, exec(QLatin1String("select %1('world')").arg(hello)));
+ QVERIFY_SQL(q, next());
- QCOMPARE( q.value( 0 ).toString(), QString( "Hello harald" ) );
+ QCOMPARE(q.value(0).toString(), u"Hello world");
- QVERIFY_SQL( q, exec( "drop function " + hello ) );
+ QVERIFY_SQL(q, prepare(QLatin1String("select %1('harald')").arg(hello)));
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
- q.exec( "drop procedure " + qtestproc );
+ QCOMPARE(q.value(0).toString(), u"Hello harald");
- QVERIFY_SQL( q, exec( "create procedure " + qtestproc + " () "
- "BEGIN select * from " + qtest + " order by id; END" ) );
- QVERIFY_SQL( q, exec( "call " + qtestproc + "()" ) );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 1 ).toString(), QString( "VarChar1" ) );
+ QVERIFY_SQL(q, exec("drop function " + hello));
+ q.exec("drop procedure " + qtestproc);
- QVERIFY_SQL( q, exec( "drop procedure " + qtestproc ) );
+ QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 () BEGIN "
+ "select * from %2 order by id; END").arg(qtestproc, qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("call %1()").arg(qtestproc)));
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(1).toString(), u"VarChar1");
- QVERIFY_SQL( q, exec( "create procedure " + qtestproc + " (OUT param1 INT) "
- "BEGIN set param1 = 42; END" ) );
+ QVERIFY_SQL(q, exec("drop procedure " + qtestproc));
+ QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 (OUT param1 INT) "
+ "BEGIN set param1 = 42; END").arg(qtestproc)));
- QVERIFY_SQL( q, exec( "call " + qtestproc + " (@out)" ) );
- QVERIFY_SQL( q, exec( "select @out" ) );
- QCOMPARE( q.record().fieldName( 0 ), QString( "@out" ) );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 42 );
+ QVERIFY_SQL(q, exec(QLatin1String("call %1 (@out)").arg(qtestproc)));
+ QVERIFY_SQL(q, exec("select @out"));
+ QCOMPARE(q.record().fieldName(0), u"@out");
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 42);
- QVERIFY_SQL( q, exec( "drop procedure " + qtestproc ) );
+ QVERIFY_SQL(q, exec("drop procedure " + qtestproc));
}
void tst_QSqlQuery::bindBool()
{
- // QTBUG-27763: bool value got converted to int 127 by mysql driver because sizeof(bool) < sizeof(int).
- // The problem was the way the bool value from the application was handled. For our purposes here, it
- // doesn't matter whether the column type is BOOLEAN or INT. All DBMSs have INT, and this usually
- // works for this test. Postresql is an exception because its INT type does not accept BOOLEAN
- // values and its BOOLEAN columns do not accept INT values.
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ // QTBUG-27763: bool value got converted to int 127 by mysql driver because
+ // sizeof(bool) < sizeof(int). The problem was the way the bool value from
+ // the application was handled. For our purposes here, it doesn't matter
+ // whether the column type is BOOLEAN or INT. All DBMSs have INT, and this
+ // usually works for this test. Postresql is an exception because its INT
+ // type does not accept BOOLEAN values and its BOOLEAN columns do not accept
+ // INT values.
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
const QString tableName(qTableName("bindBool", __FILE__, db));
q.exec("DROP TABLE " + tableName);
const bool useBooleanType = (dbType == QSqlDriver::PostgreSQL || dbType == QSqlDriver::Interbase);
- const QString colType = useBooleanType ? QLatin1String("BOOLEAN") : QLatin1String("INT");
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INT, flag " + colType + " NOT NULL, PRIMARY KEY(id))"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %2 (id INT, flag %1 NOT NULL, PRIMARY KEY(id))")
+ .arg(QLatin1String(useBooleanType ? "BOOLEAN" : "INT"), tableName)));
for (int i = 0; i < 2; ++i) {
bool flag = i;
- q.prepare("INSERT INTO " + tableName + " (id, flag) VALUES(:id, :flag)");
+ q.prepare(QLatin1String("INSERT INTO %1 (id, flag) VALUES(:id, :flag)").arg(tableName));
q.bindValue(":id", i);
q.bindValue(":flag", flag);
QVERIFY_SQL(q, exec());
}
- QVERIFY_SQL(q, exec("SELECT id, flag FROM " + tableName + " ORDER BY id"));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT id, flag FROM %1 ORDER BY id").arg(tableName)));
for (int i = 0; i < 2; ++i) {
bool flag = i;
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toInt(), i);
QCOMPARE(q.value(1).toBool(), flag);
}
- QVERIFY_SQL(q, prepare("SELECT flag FROM " + tableName + " WHERE flag = :filter"));
+ QVERIFY_SQL(q, prepare(QLatin1String(
+ "SELECT flag FROM %1 WHERE flag = :filter").arg(tableName)));
const bool filter = true;
q.bindValue(":filter", filter);
QVERIFY_SQL(q, exec());
@@ -661,105 +647,112 @@ void tst_QSqlQuery::bindBool()
void tst_QSqlQuery::oraOutValues()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString tst_outValues(qTableName("tst_outValues", __FILE__, db));
- if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
- QSKIP( "Test requires prepared query support");
+ if (!db.driver()->hasFeature(QSqlDriver::PreparedQueries))
+ QSKIP("Test requires prepared query support");
- QSqlQuery q( db );
+ QSqlQuery q(db);
- q.setForwardOnly( true );
+ q.setForwardOnly(true);
/*** outvalue int ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x out int) is\n"
- "begin\n"
- " x := 42;\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- q.addBindValue( 0, QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 0 ).toInt(), 42 );
-
- // bind a null value, make sure the OCI driver resets the null flag
- q.addBindValue( QVariant(QMetaType(QMetaType::Int)), QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 0 ).toInt(), 42 );
- QVERIFY( !q.boundValue( 0 ).isNull() );
+ QVERIFY_SQL(q, exec(QLatin1String("create or replace procedure %1(x out int) is\n"
+ "begin\n"
+ " x := 42;\n"
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ q.addBindValue(0, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(0).toInt(), 42);
+
+ // Bind a null value, make sure the OCI driver resets the null flag:
+ q.addBindValue(QVariant(QMetaType(QMetaType::Int)), QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(0).toInt(), 42);
+ QVERIFY(!q.boundValue(0).isNull());
/*** outvalue varchar ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x out varchar) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x out varchar) is\n"
"begin\n"
" x := 'blah';\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- QString s1( "12345" );
- s1.reserve( 512 );
- q.addBindValue( s1, QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 0 ).toString(), QString( "blah" ) );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ QString s1("12345");
+ s1.reserve(512);
+ q.addBindValue(s1, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(0).toString(), u"blah");
/*** in/outvalue numeric ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x in out numeric) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in out numeric) is\n"
"begin\n"
" x := x + 10;\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- q.addBindValue( 10, QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 0 ).toInt(), 20 );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ q.addBindValue(10, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(0).toInt(), 20);
/*** in/outvalue varchar ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x in out varchar) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in out varchar) is\n"
"begin\n"
" x := 'homer';\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- q.addBindValue( QString( "maggy" ), QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 0 ).toString(), QString( "homer" ) );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ q.addBindValue(u"maggy"_s, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(0).toString(), u"homer");
/*** in/outvalue varchar ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x in out varchar) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in out varchar) is\n"
"begin\n"
" x := NULL;\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- q.addBindValue( QString( "maggy" ), QSql::Out );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.boundValue( 0 ).isNull() );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ q.addBindValue(u"maggy"_s, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.boundValue(0).isNull());
/*** in/outvalue int ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x in out int) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in out int) is\n"
"begin\n"
" x := NULL;\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- q.addBindValue( 42, QSql::Out );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.boundValue( 0 ).isNull() );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?)").arg(tst_outValues)));
+ q.addBindValue(42, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.boundValue(0).isNull());
/*** in/outvalue varchar ***/
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x in varchar, y out varchar) is\n"
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in varchar, y out varchar) is\n"
"begin\n"
" y := x||'bubulalakikikokololo';\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?, ?)" ) );
- q.addBindValue( QString( "fifi" ), QSql::In );
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?, ?)").arg(tst_outValues)));
+ q.addBindValue(u"fifi"_s, QSql::In);
QString out;
- out.reserve( 50 );
- q.addBindValue( out, QSql::Out );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValue( 1 ).toString(), QString( "fifibubulalakikikokololo" ) );
+ out.reserve(50);
+ q.addBindValue(out, QSql::Out);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValue(1).toString(), u"fifibubulalakikikokololo");
/*** in/outvalue date ***/
- QVERIFY_SQL(q, exec("create or replace procedure " + tst_outValues + "(x in date, y out date) is\n"
- "begin\n"
- " y := x;\n"
- "end;\n"));
- QVERIFY(q.prepare("call " + tst_outValues + "(?, ?)"));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in date, y out date) is\n"
+ "begin\n"
+ " y := x;\n"
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?, ?)").arg(tst_outValues)));
const QDate date = QDate::currentDate();
q.addBindValue(date, QSql::In);
q.addBindValue(QVariant(QDate()), QSql::Out);
@@ -767,11 +760,12 @@ void tst_QSqlQuery::oraOutValues()
QCOMPARE(q.boundValue(1).toDate(), date);
/*** in/outvalue timestamp ***/
- QVERIFY_SQL(q, exec("create or replace procedure " + tst_outValues + "(x in timestamp, y out timestamp) is\n"
- "begin\n"
- " y := x;\n"
- "end;\n"));
- QVERIFY(q.prepare("call " + tst_outValues + "(?, ?)"));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1(x in timestamp, y out timestamp) is\n"
+ "begin\n"
+ " y := x;\n"
+ "end;\n").arg(tst_outValues)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?, ?)").arg(tst_outValues)));
const QDateTime dt = QDateTime::currentDateTime();
q.addBindValue(dt, QSql::In);
q.addBindValue(QVariant(QMetaType(QMetaType::QDateTime)), QSql::Out);
@@ -781,53 +775,56 @@ void tst_QSqlQuery::oraOutValues()
void tst_QSqlQuery::oraClob()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString clobby(qTableName("clobby", __FILE__, db));
- QSqlQuery q( db );
-
- // simple short string
- QVERIFY_SQL( q, exec( "create table " + clobby + "(id int primary key, cl clob, bl blob)" ) );
- QVERIFY_SQL( q, prepare( "insert into " + clobby + " (id, cl, bl) values(?, ?, ?)" ) );
- q.addBindValue( 1 );
- q.addBindValue( "bubu" );
- q.addBindValue( QByteArray("bubu") );
- QVERIFY_SQL( q, exec() );
-
- QVERIFY_SQL( q, exec( "select bl, cl from " + clobby + " where id = 1" ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toString(), QString( "bubu" ) );
- QCOMPARE( q.value( 1 ).toString(), QString( "bubu" ) );
-
- // simple short string with binding
- QVERIFY_SQL( q, prepare( "insert into " + clobby + " (id, cl, bl) values(?, ?, ?)" ) );
- q.addBindValue( 2 );
- q.addBindValue( "lala", QSql::Binary );
- q.addBindValue( QByteArray("lala"), QSql::Binary );
- QVERIFY_SQL( q, exec() );
-
- QVERIFY_SQL( q, exec( "select bl, cl from " + clobby + " where id = 2" ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toString(), QString( "lala" ) );
- QCOMPARE( q.value( 1 ).toString(), QString( "lala" ) );
-
- // loooong string
- QString loong;
- loong.fill( QLatin1Char( 'A' ), 25000 );
- QVERIFY_SQL( q, prepare( "insert into " + clobby + " (id, cl, bl) values(?, ?, ?)" ) );
- q.addBindValue( 3 );
- q.addBindValue( loong, QSql::Binary );
- q.addBindValue( loong.toLatin1(), QSql::Binary );
- QVERIFY_SQL( q, exec() );
-
- QVERIFY_SQL( q, exec( "select bl, cl from " + clobby + " where id = 3" ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toString().count(), loong.count() );
- QVERIFY( q.value( 0 ).toString() == loong );
- QCOMPARE( q.value( 1 ).toByteArray().count(), loong.toLatin1().count() );
- QVERIFY( q.value( 1 ).toByteArray() == loong.toLatin1() );
+ QSqlQuery q(db);
+
+ // Simple short string:
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1(id int primary key, cl clob, bl blob)")
+ .arg(clobby)));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (id, cl, bl) values(?, ?, ?)")
+ .arg(clobby)));
+ q.addBindValue(1);
+ q.addBindValue("bubu");
+ q.addBindValue("bubu"_ba);
+ QVERIFY_SQL(q, exec());
+
+ QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 1").arg(clobby)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toString(), u"bubu");
+ QCOMPARE(q.value(1).toString(), u"bubu");
+
+ // Simple short string with binding:
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (id, cl, bl) values(?, ?, ?)")
+ .arg(clobby)));
+ q.addBindValue(2);
+ q.addBindValue(u"lala"_s, QSql::Binary);
+ q.addBindValue("lala"_ba, QSql::Binary);
+ QVERIFY_SQL(q, exec());
+
+ QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 2").arg(clobby)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toString(), u"lala");
+ QCOMPARE(q.value(1).toString(), u"lala");
+
+ // Loooong string:
+ const QString loong(25000, QLatin1Char('A'));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (id, cl, bl) values(?, ?, ?)")
+ .arg(clobby)));
+ q.addBindValue(3);
+ q.addBindValue(loong, QSql::Binary);
+ q.addBindValue(loong.toLatin1(), QSql::Binary);
+ QVERIFY_SQL(q, exec());
+
+ QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 3").arg(clobby)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toString().size(), loong.size());
+ QVERIFY(q.value(0).toString() == loong); // Deliberately not QCOMPARE() as too long
+ QCOMPARE(q.value(1).toByteArray().size(), loong.toLatin1().size());
+ QVERIFY(q.value(1).toByteArray() == loong.toLatin1()); // ditto
}
void tst_QSqlQuery::oraClobBatch()
@@ -838,268 +835,281 @@ void tst_QSqlQuery::oraClobBatch()
const QString clobBatch(qTableName("clobBatch", __FILE__, db));
tst_Databases::safeDropTables(db, { clobBatch });
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("create table " + clobBatch + "(cl clob)"));
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1(cl clob)").arg(clobBatch)));
const QString longString(USHRT_MAX + 1, QLatin1Char('A'));
- QVERIFY_SQL(q, prepare("insert into " + clobBatch + " (cl) values(:cl)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (cl) values(:cl)").arg(clobBatch)));
const QVariantList vars = { longString };
q.addBindValue(vars);
QVERIFY_SQL(q, execBatch());
QVERIFY_SQL(q, exec("select cl from " + clobBatch));
QVERIFY(q.next());
- QCOMPARE(q.value(0).toString().count(), longString.size());
- QVERIFY(q.value(0).toString() == longString);
+ QCOMPARE(q.value(0).toString().size(), longString.size());
+ QVERIFY(q.value(0).toString() == longString); // As above. deliberately not QCOMPARE().
}
void tst_QSqlQuery::storedProceduresIBase()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
const auto procName = qTableName("TESTPROC", __FILE__, db);
q.exec("drop procedure " + procName);
- QVERIFY_SQL(q, exec("create procedure " + procName +
- " RETURNS (x integer, y varchar(20)) "
- "AS BEGIN "
- " x = 42; "
- " y = 'Hello Anders'; "
- "END" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 RETURNS (x integer, y varchar(20)) "
+ "AS BEGIN "
+ " x = 42; "
+ " y = 'Hello Anders'; "
+ "END").arg(procName)));
+ const auto tidier = qScopeGuard([&]() { q.exec("drop procedure " + procName); });
QVERIFY_SQL(q, prepare("execute procedure " + procName));
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
- // check for a valid result set
+ // Check for a valid result set:
QSqlRecord rec = q.record();
- QCOMPARE( rec.count(), 2 );
- QCOMPARE( rec.fieldName( 0 ).toUpper(), QString( "X" ) );
- QCOMPARE( rec.fieldName( 1 ).toUpper(), QString( "Y" ) );
+ QCOMPARE(rec.count(), 2);
+ QCOMPARE(rec.fieldName(0).toUpper(), u"X");
+ QCOMPARE(rec.fieldName(1).toUpper(), u"Y");
- // the first next shall suceed
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 42 );
- QCOMPARE( q.value( 1 ).toString(), QString( "Hello Anders" ) );
-
- // the second next shall fail
- QVERIFY( !q.next() );
+ // The first next shall suceed:
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 42);
+ QCOMPARE(q.value(1).toString(), u"Hello Anders");
- q.exec("drop procedure " + procName);
+ // The second next shall fail:
+ QVERIFY(!q.next());
}
void tst_QSqlQuery::outValuesDB2()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
- QSKIP( "Test requires prepared query support");
+ if (!db.driver()->hasFeature(QSqlDriver::PreparedQueries))
+ QSKIP("Test requires prepared query support");
- QSqlQuery q( db );
+ QSqlQuery q(db);
- q.setForwardOnly( true );
+ q.setForwardOnly(true);
- q.exec("drop procedure " + qTableName("tst_outValues", __FILE__, db)); //non-fatal
- QVERIFY_SQL( q, exec( "CREATE PROCEDURE " + qTableName("tst_outValues", __FILE__, db) +
- " (OUT x int, OUT x2 double, OUT x3 char(20))\n"
- "LANGUAGE SQL\n"
- "P1: BEGIN\n"
- " SET x = 42;\n"
- " SET x2 = 4.2;\n"
- " SET x3 = 'Homer';\n"
- "END P1" ) );
+ const QString procName = qTableName("tst_outValues", __FILE__, db);
+ q.exec("drop procedure " + procName); // non-fatal
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE PROCEDURE %1 "
+ "(OUT x int, OUT x2 double, OUT x3 char(20))\n"
+ "LANGUAGE SQL\n"
+ "P1: BEGIN\n"
+ " SET x = 42;\n"
+ " SET x2 = 4.2;\n"
+ " SET x3 = 'Homer';\n"
+ "END P1").arg(procName)));
- QVERIFY_SQL(q, prepare("call " + qTableName("tst_outValues", __FILE__, db) + "(?, ?, ?)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("call %1(?, ?, ?)").arg(procName)));
- q.addBindValue( 0, QSql::Out );
- q.addBindValue( 0.0, QSql::Out );
- q.addBindValue( "Simpson", QSql::Out );
+ q.addBindValue(0, QSql::Out);
+ q.addBindValue(0.0, QSql::Out);
+ q.addBindValue("Simpson", QSql::Out);
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
- QCOMPARE( q.boundValue( 0 ).toInt(), 42 );
- QCOMPARE( q.boundValue( 1 ).toDouble(), 4.2 );
- QCOMPARE( q.boundValue( 2 ).toString().trimmed(), QString( "Homer" ) );
+ QCOMPARE(q.boundValue(0).toInt(), 42);
+ QCOMPARE(q.boundValue(1).toDouble(), 4.2);
+ QCOMPARE(q.boundValue(2).toString().trimmed(), u"Homer");
}
void tst_QSqlQuery::outValues()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString tst_outValues(qTableName("tst_outValues", __FILE__, db));
- if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
- QSKIP( "Test requires prepared query support");
+ if (!db.driver()->hasFeature(QSqlDriver::PreparedQueries))
+ QSKIP("Test requires prepared query support");
- QSqlQuery q( db );
+ QSqlQuery q(db);
- q.setForwardOnly( true );
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType == QSqlDriver::Oracle) {
- QVERIFY_SQL( q, exec( "create or replace procedure " + tst_outValues + "(x out int) is\n"
+ q.setForwardOnly(true);
+ QLatin1String creator, caller;
+ switch (tst_Databases::getDatabaseType(db)) {
+ case QSqlDriver::Oracle:
+ creator = QLatin1String("create or replace procedure %1(x out int) is\n"
"begin\n"
" x := 42;\n"
- "end;\n" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- } else if (dbType == QSqlDriver::DB2) {
- q.exec( "drop procedure " + tst_outValues ); //non-fatal
- QVERIFY_SQL( q, exec( "CREATE PROCEDURE " + tst_outValues + " (OUT x int)\n"
+ "end;\n");
+ caller = QLatin1String("call %1(?)");
+ break;
+ case QSqlDriver::DB2:
+ q.exec("drop procedure " + tst_outValues); // non-fatal
+ creator = QLatin1String("CREATE PROCEDURE %1 (OUT x int)\n"
"LANGUAGE SQL\n"
"P1: BEGIN\n"
" SET x = 42;\n"
- "END P1" ) );
- QVERIFY( q.prepare( "call " + tst_outValues + "(?)" ) );
- } else if (dbType == QSqlDriver::MSSqlServer) {
- q.exec( "drop procedure " + tst_outValues ); //non-fatal
- QVERIFY_SQL( q, exec( "create procedure " + tst_outValues + " (@x int out) as\n"
+ "END P1");
+ caller = QLatin1String("call %1(?)");
+ break;
+ case QSqlDriver::MSSqlServer:
+ q.exec("drop procedure " + tst_outValues); // non-fatal
+ creator = QLatin1String("create procedure %1 (@x int out) as\n"
"begin\n"
" set @x = 42\n"
- "end\n" ) );
- QVERIFY( q.prepare( "{call " + tst_outValues + "(?)}" ) );
- } else
- QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test");
+ "end\n");
+ caller = QLatin1String("{call %1(?)}");
+ break;
+ default:
+ QSKIP("Don't know how to create a stored procedure for this database server, "
+ "please fix this test");
+ }
+ QVERIFY_SQL(q, exec(creator.arg(tst_outValues)));
+ QVERIFY(q.prepare(caller.arg(tst_outValues)));
- q.addBindValue( 0, QSql::Out );
+ q.addBindValue(0, QSql::Out);
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
- QCOMPARE( q.boundValue( 0 ).toInt(), 42 );
+ QCOMPARE(q.boundValue(0).toInt(), 42);
}
void tst_QSqlQuery::blob()
{
- static const int BLOBSIZE = 1024 * 10;
- static const int BLOBCOUNT = 2;
+ constexpr int BLOBSIZE = 1024 * 10;
+ constexpr int BLOBCOUNT = 2;
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) )
- QSKIP( "DBMS not BLOB capable");
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- //don' make it too big otherwise sybase and mysql will complain
- QByteArray ba( BLOBSIZE, 0 );
+ if (!db.driver()->hasFeature(QSqlDriver::BLOB))
+ QSKIP("DBMS not BLOB capable");
+ // Don't make it too big otherwise sybase and mysql will complain:
+ QByteArray ba(BLOBSIZE, Qt::Uninitialized);
for (int i = 0; i < ba.size(); ++i)
ba[i] = i % 256;
- QSqlQuery q( db );
-
- q.setForwardOnly( true );
+ QSqlQuery q(db);
+ q.setForwardOnly(true);
+ const QString tableName = qTableName("qtest_blob", __FILE__, db);
- QString queryString = QString("create table " + qTableName("qtest_blob", __FILE__, db) +
- " (id int not null primary key, t_blob %1)" ).arg( tst_Databases::blobTypeName( db, BLOBSIZE ) );
- QVERIFY_SQL( q, exec( queryString ) );
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int not null primary key, t_blob %2)")
+ .arg(tableName, tst_Databases::blobTypeName(db, BLOBSIZE))));
- QVERIFY_SQL(q, prepare("insert into " + qTableName("qtest_blob", __FILE__, db) + " (id, t_blob) values (?, ?)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (id, t_blob) values (?, ?)")
+ .arg(tableName)));
for (int i = 0; i < BLOBCOUNT; ++i) {
- q.addBindValue( i );
- q.addBindValue( ba );
- QVERIFY_SQL( q, exec() );
+ q.addBindValue(i);
+ q.addBindValue(ba);
+ QVERIFY_SQL(q, exec());
}
- QVERIFY_SQL(q, exec("select * from " + qTableName("qtest_blob", __FILE__, db)));
+ QVERIFY_SQL(q, exec("select * from " + tableName));
for (int i = 0; i < BLOBCOUNT; ++i) {
- QVERIFY( q.next() );
- QByteArray res = q.value( 1 ).toByteArray();
- QVERIFY2( res.size() >= ba.size(),
- QString( "array sizes differ, expected %1, got %2" ).arg( ba.size() ).arg( res.size() ).toLatin1() );
+ QVERIFY(q.next());
+ QByteArray res = q.value(1).toByteArray();
+ QVERIFY2(res.size() >= ba.size(),
+ qPrintable(QString::asprintf(
+ "array sizes differ, expected (at least) %" PRIdQSIZETYPE
+ ", got %" PRIdQSIZETYPE, ba.size(), res.size())));
for (int i2 = 0; i2 < ba.size(); ++i2) {
- if ( res[i2] != ba[i2] )
- QFAIL( QString( "ByteArrays differ at position %1, expected %2, got %3" ).arg(
- i2 ).arg(( int )( unsigned char )ba[i2] ).arg(( int )( unsigned char )res[i2] ).toLatin1() );
+ if (res[i2] != ba[i2]) {
+ QFAIL(qPrintable(QString::asprintf(
+ "ByteArrays differ at position %d, expected %hhu, got %hhu",
+ i2, ba[i2], res[i2])));
+ }
}
}
}
void tst_QSqlQuery::value()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- QSqlQuery q( db );
- QVERIFY_SQL( q, exec( "select id, t_varchar, t_char from " + qtest + " order by id" ) );
- int i = 1;
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String("select id, t_varchar, t_char from %1 order by id")
+ .arg(qtest)));
- while ( q.next() ) {
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( "id" ).toInt(), i );
+ for (int i = 1; q.next(); ++i) {
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value("id").toInt(), i);
+ auto istring = QString::number(i);
if (dbType == QSqlDriver::Interbase)
- QVERIFY( q.value( 1 ).toString().startsWith( "VarChar" + QString::number( i ) ) );
- else if ( q.value( 1 ).toString().endsWith(QLatin1Char(' ')))
- QCOMPARE( q.value( 1 ).toString(), ( "VarChar" + QString::number( i ) + " " ) );
+ QVERIFY(q.value(1).toString().startsWith("VarChar" + istring));
+ else if (q.value(1).toString().endsWith(QLatin1Char(' ')))
+ QCOMPARE(q.value(1).toString(), QLatin1String("VarChar%1 ").arg(istring));
else
- QCOMPARE( q.value( 1 ).toString(), ( "VarChar" + QString::number( i ) ) );
+ QCOMPARE(q.value(1).toString(), "VarChar" + istring);
if (dbType == QSqlDriver::Interbase)
- QVERIFY( q.value( 2 ).toString().startsWith( "Char" + QString::number( i ) ) );
- else if (!q.value( 2 ).toString().endsWith(QLatin1Char(' ')))
- QCOMPARE( q.value( 2 ).toString(), ( "Char" + QString::number( i ) ) );
+ QVERIFY(q.value(2).toString().startsWith("Char" + istring));
+ else if (q.value(2).toString().endsWith(QLatin1Char(' ')))
+ QCOMPARE(q.value(2).toString(), QLatin1String("Char%1 ").arg(istring));
else
- QCOMPARE( q.value( 2 ).toString(), ( "Char" + QString::number( i ) + " " ) );
-
- i++;
+ QCOMPARE(q.value(2).toString(), "Char" + istring);
}
}
#define SETUP_RECORD_TABLE \
do { \
- QVERIFY_SQL(q, exec("CREATE TABLE " + tst_record + " (id integer, extra varchar(50))")); \
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id integer, extra varchar(50))") \
+ .arg(tst_record))); \
for (int i = 0; i < 3; ++i) \
- QVERIFY_SQL(q, exec(QString("INSERT INTO " + tst_record + " VALUES(%1, 'extra%1')").arg(i))); \
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(%2, 'extra%2')") \
+ .arg(tst_record).arg(i))); \
} while (0)
#define CHECK_RECORD \
do { \
- QVERIFY_SQL(q, exec(QString("select %1.id, %1.t_varchar, %1.t_char, %2.id, %2.extra from %1, %2 where " \
- "%1.id = %2.id order by %1.id").arg(lowerQTest).arg(tst_record))); \
- QCOMPARE(q.record().fieldName(0).toLower(), QString("id")); \
+ QVERIFY_SQL(q, exec(QLatin1String( \
+ "select %1.id, %1.t_varchar, %1.t_char, %2.id, %2.extra " \
+ "from %1, %2 where %1.id = %2.id order by %1.id") \
+ .arg(lowerQTest, tst_record))); \
+ QCOMPARE(q.record().fieldName(0).toLower(), u"id"); \
QCOMPARE(q.record().field(0).tableName().toLower(), lowerQTest); \
- QCOMPARE(q.record().fieldName(1).toLower(), QString("t_varchar")); \
+ QCOMPARE(q.record().fieldName(1).toLower(), u"t_varchar"); \
QCOMPARE(q.record().field(1).tableName().toLower(), lowerQTest); \
- QCOMPARE(q.record().fieldName(2).toLower(), QString("t_char")); \
+ QCOMPARE(q.record().fieldName(2).toLower(), u"t_char"); \
QCOMPARE(q.record().field(2).tableName().toLower(), lowerQTest); \
- QCOMPARE(q.record().fieldName(3).toLower(), QString("id")); \
+ QCOMPARE(q.record().fieldName(3).toLower(), u"id"); \
QCOMPARE(q.record().field(3).tableName().toLower(), tst_record); \
- QCOMPARE(q.record().fieldName(4).toLower(), QString("extra")); \
+ QCOMPARE(q.record().fieldName(4).toLower(), u"extra"); \
QCOMPARE(q.record().field(4).tableName().toLower(), tst_record); \
} while (0)
void tst_QSqlQuery::record()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( q.record().isEmpty() );
- QVERIFY_SQL( q, exec( "select id, t_varchar, t_char from " + qtest + " order by id" ) );
- QCOMPARE( q.record().fieldName( 0 ).toLower(), QString( "id" ) );
- QCOMPARE( q.record().fieldName( 1 ).toLower(), QString( "t_varchar" ) );
- QCOMPARE( q.record().fieldName( 2 ).toLower(), QString( "t_char" ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QVERIFY(q.record().isEmpty());
+ QVERIFY_SQL(q, exec(QLatin1String("select id, t_varchar, t_char from %1 order by id")
+ .arg(qtest)));
+ QCOMPARE(q.record().fieldName(0).toLower(), u"id");
+ QCOMPARE(q.record().fieldName(1).toLower(), u"t_varchar");
+ QCOMPARE(q.record().fieldName(2).toLower(), u"t_char");
QCOMPARE(q.record().value(0), QVariant(q.record().field(0).metaType()));
QCOMPARE(q.record().value(1), QVariant(q.record().field(1).metaType()));
QCOMPARE(q.record().value(2), QVariant(q.record().field(2).metaType()));
- QVERIFY( q.next() );
- QVERIFY( q.next() );
-
- QCOMPARE( q.record().fieldName( 0 ).toLower(), QString( "id" ) );
- QCOMPARE( q.value( 0 ).toInt(), 2 );
+ QVERIFY(q.next());
+ QVERIFY(q.next());
+ QCOMPARE(q.record().fieldName(0).toLower(), u"id");
+ QCOMPARE(q.value(0).toInt(), 2);
- const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType == QSqlDriver::Oracle)
+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::Oracle)
QSKIP("Getting the tablename is not supported in Oracle");
+
const auto lowerQTest = qtest.toLower();
for (int i = 0; i < 3; ++i)
QCOMPARE(q.record().field(i).tableName().toLower(), lowerQTest);
@@ -1109,7 +1119,7 @@ void tst_QSqlQuery::record()
CHECK_RECORD;
q.clear();
- // Recreate the tables, in a different order
+ // Recreate the tables, in a different order:
const QStringList tables = { qtest, tst_record, qTableName("qtest_null", __FILE__, db) };
tst_Databases::safeDropTables(db, tables);
SETUP_RECORD_TABLE;
@@ -1120,273 +1130,268 @@ void tst_QSqlQuery::record()
void tst_QSqlQuery::isValid()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( !q.isValid() );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.first() );
- QVERIFY( q.isValid() );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QVERIFY(!q.isValid());
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.first());
+ QVERIFY(q.isValid());
}
void tst_QSqlQuery::isActive()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( !q.isActive() );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.isActive() );
- QVERIFY( q.last() );
-
- if ( !tst_Databases::isMSAccess( db ) )
- // Access is stupid enough to let you scroll over boundaries
- QVERIFY( !q.next() );
-
- QVERIFY( q.isActive() );
-
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (41, 'VarChar41', 'Char41')" ) );
-
- QVERIFY( q.isActive() );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QVERIFY_SQL( q, exec( "update " + qtest + " set id = 42 where id = 41" ) );
+ QSqlQuery q(db);
+ QVERIFY(!q.isActive());
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.isActive());
+ QVERIFY(q.last());
- QVERIFY( q.isActive() );
+ // Access is stupid enough to let you scroll over boundaries:
+ if (!tst_Databases::isMSAccess(db))
+ QVERIFY(!q.next());
+ QVERIFY(q.isActive());
- QVERIFY_SQL( q, exec( "delete from " + qtest + " where id = 42" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (41, 'VarChar41', 'Char41')")
+ .arg(qtest)));
+ QVERIFY(q.isActive());
- QVERIFY( q.isActive() );
+ QVERIFY_SQL(q, exec(QLatin1String("update %1 set id = 42 where id = 41").arg(qtest)));
+ QVERIFY(q.isActive());
- QVERIFY_SQL( q, exec( "delete from " + qtest + " where id = 42" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("delete from %1 where id = 42").arg(qtest)));
+ QVERIFY(q.isActive());
- QVERIFY( q.isActive() );
+ QVERIFY_SQL(q, exec(QLatin1String("delete from %1 where id = 42").arg(qtest)));
+ QVERIFY(q.isActive());
}
void tst_QSqlQuery::numRowsAffected()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
- QCOMPARE( q.numRowsAffected(), -1 );
+ QSqlQuery q(db);
+ QCOMPARE(q.numRowsAffected(), -1);
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- int i = 0;
+ QVERIFY_SQL(q, exec("select * from " + qtest));
- while ( q.next() )
+ int i = 0;
+ while (q.next())
++i;
- if ( q.numRowsAffected() == -1 || q.numRowsAffected() == 0 )
+ if (q.numRowsAffected() == -1 || q.numRowsAffected() == 0)
QSKIP("Database doesn't support numRowsAffected");
- if ( q.numRowsAffected() != -1 && q.numRowsAffected() != 0 && q.numRowsAffected() != i ) {
- // the value is undefined for SELECT, this check is just here for curiosity
- qDebug( "Expected numRowsAffected to be -1, 0 or %d, got %d", i, q.numRowsAffected() );
- }
+ // Value is undefined for SELECT, this check is just here for curiosity:
+ if (q.numRowsAffected() != -1 && q.numRowsAffected() != 0 && q.numRowsAffected() != i)
+ qDebug("Expected numRowsAffected to be -1, 0 or %d, got %d", i, q.numRowsAffected());
- QVERIFY_SQL( q, exec( "update " + qtest + " set id = 100 where id = 1" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("update %1 set id = 100 where id = 1").arg(qtest)));
- QCOMPARE( q.numRowsAffected(), 1 );
- QCOMPARE( q.numRowsAffected(), 1 ); // yes, we check twice
+ QCOMPARE(q.numRowsAffected(), 1);
+ QCOMPARE(q.numRowsAffected(), 1); // yes, we check twice
- QVERIFY_SQL( q, exec( "update " + qtest + " set id = id + 100" ) );
- QCOMPARE( q.numRowsAffected(), i );
- QCOMPARE( q.numRowsAffected(), i ); // yes, we check twice
+ QVERIFY_SQL(q, exec(QLatin1String("update %1 set id = id + 100").arg(qtest)));
+ QCOMPARE(q.numRowsAffected(), i);
+ QCOMPARE(q.numRowsAffected(), i); // yes, we check twice
- QVERIFY_SQL( q, prepare( "update " + qtest + " set id = id + :newid" ) );
+ QVERIFY_SQL(q, prepare(QLatin1String("update %1 set id = id + :newid").arg(qtest)));
q.bindValue(":newid", 100);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.numRowsAffected(), i );
- QCOMPARE( q.numRowsAffected(), i ); // yes, we check twice
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.numRowsAffected(), i);
+ QCOMPARE(q.numRowsAffected(), i); // yes, we check twice
- QVERIFY_SQL( q, prepare( "update " + qtest + " set id = id + :newid where NOT(1 = 1)" ) );
+ QVERIFY_SQL(q, prepare(QLatin1String("update %1 set id = id + :newid where NOT(1 = 1)")
+ .arg(qtest)));
q.bindValue(":newid", 100);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.numRowsAffected(), 0 );
- QCOMPARE( q.numRowsAffected(), 0 ); // yes, we check twice
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.numRowsAffected(), 0);
+ QCOMPARE(q.numRowsAffected(), 0); // yes, we check twice
- QVERIFY_SQL( q, exec( "insert into " + qtest + " values (42000, 'homer', 'marge')" ) );
- QCOMPARE( q.numRowsAffected(), 1 );
- QCOMPARE( q.numRowsAffected(), 1 ); // yes, we check twice
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (42000, 'homer', 'marge')")
+ .arg(qtest)));
+ QCOMPARE(q.numRowsAffected(), 1);
+ QCOMPARE(q.numRowsAffected(), 1); // yes, we check twice
- QSqlQuery q2( db );
- QVERIFY_SQL( q2, exec( "insert into " + qtest + " values (42001, 'homer', 'marge')" ) );
+ QSqlQuery q2(db);
+ QVERIFY_SQL(q2, exec(QLatin1String("insert into %1 values (42001, 'homer', 'marge')")
+ .arg(qtest)));
- if ( !db.driverName().startsWith( "QSQLITE2" ) ) {
+ if (!db.driverName().startsWith("QSQLITE2")) {
// SQLite 2.x accumulates changed rows in nested queries. See task 33794
- QCOMPARE( q2.numRowsAffected(), 1 );
- QCOMPARE( q2.numRowsAffected(), 1 ); // yes, we check twice
+ QCOMPARE(q2.numRowsAffected(), 1);
+ QCOMPARE(q2.numRowsAffected(), 1); // yes, we check twice
}
}
void tst_QSqlQuery::size()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QCOMPARE(q.size(), -1);
- QSqlQuery q( db );
- QCOMPARE( q.size(), -1 );
+ QVERIFY_SQL(q, exec("select * from " + qtest));
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
int i = 0;
-
- while ( q.next() )
+ while (q.next())
++i;
- if ( db.driver()->hasFeature( QSqlDriver::QuerySize ) ) {
- QCOMPARE( q.size(), i );
- QCOMPARE( q.size(), i ); // yes, twice
+ if (db.driver()->hasFeature(QSqlDriver::QuerySize)) {
+ QCOMPARE(q.size(), i);
+ QCOMPARE(q.size(), i); // yes, twice
} else {
- QCOMPARE( q.size(), -1 );
- QCOMPARE( q.size(), -1 ); // yes, twice
+ QCOMPARE(q.size(), -1);
+ QCOMPARE(q.size(), -1); // yes, twice
}
- QSqlQuery q2( "select * from " + qtest, db );
+ QSqlQuery q2("select * from " + qtest, db);
- if ( db.driver()->hasFeature( QSqlDriver::QuerySize ) )
- QCOMPARE( q.size(), i );
+ if (db.driver()->hasFeature(QSqlDriver::QuerySize))
+ QCOMPARE(q.size(), i);
else
- QCOMPARE( q.size(), -1 );
+ QCOMPARE(q.size(), -1);
q2.clear();
- QVERIFY_SQL( q, exec( "update " + qtest + " set id = 100 where id = 1" ) );
- QCOMPARE( q.size(), -1 );
- QCOMPARE( q.size(), -1 ); // yes, twice
+ QVERIFY_SQL(q, exec(QLatin1String("update %1 set id = 100 where id = 1").arg(qtest)));
+ QCOMPARE(q.size(), -1);
+ QCOMPARE(q.size(), -1); // yes, twice
}
void tst_QSqlQuery::isSelect()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.isSelect() );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.isSelect());
- QVERIFY_SQL( q, exec( "update " + qtest + " set id = 1 where id = 1" ) );
- QVERIFY( q.isSelect() == false );
+ QVERIFY_SQL(q, exec(QLatin1String("update %1 set id = 1 where id = 1").arg(qtest)));
+ QVERIFY(!q.isSelect());
}
void tst_QSqlQuery::first()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.last() );
- QVERIFY_SQL( q, first() );
- QVERIFY( q.at() == 0 );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.last());
+ QVERIFY_SQL(q, first());
+ QCOMPARE(q.at(), 0);
}
void tst_QSqlQuery::next()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.first() );
- QVERIFY( q.next() );
- QVERIFY( q.at() == 1 );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.first());
+ QVERIFY(q.next());
+ QCOMPARE(q.at(), 1);
}
void tst_QSqlQuery::prev()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.first() );
- QVERIFY( q.next() );
- QVERIFY( q.previous() );
- QVERIFY( q.at() == 0 );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.first());
+ QVERIFY(q.next());
+ QVERIFY(q.previous());
+ QCOMPARE(q.at(), 0);
}
void tst_QSqlQuery::last()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QCOMPARE( q.at(), int( QSql::BeforeFirstRow ) );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- int i = 0;
-
- while ( q.next() )
- i++;
-
- QCOMPARE( q.at(), int( QSql::AfterLastRow ) );
-
- QVERIFY( q.last() );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSet<int> validReturns(QSet<int>() << -1 << i-1);
- QVERIFY( validReturns.contains(q.at()) );
+ QSqlQuery q(db);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec("select * from " + qtest));
- QSqlQuery q2( "select * from " + qtest, db );
+ int i = 0;
+ while (q.next())
+ ++i;
- QVERIFY( q2.last() );
+ QCOMPARE(q.at(), QSql::AfterLastRow);
+ QVERIFY(q.last());
+ QSet<int> validReturns(QSet<int>() << -1 << i - 1);
+ QVERIFY(validReturns.contains(q.at()));
- QVERIFY( validReturns.contains(q.at()) );
+ QSqlQuery q2("select * from " + qtest, db);
+ QVERIFY(q2.last());
+ QVERIFY(validReturns.contains(q.at()));
}
void tst_QSqlQuery::seek()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- QSqlQuery q( db );
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( QString( "select id from %1 order by id" ).arg( qtest ) ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ QSqlQuery q(db);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec(QLatin1String("select id from %1 order by id").arg(qtest)));
// NB! The order of the calls below are important!
- QVERIFY( q.last() );
- QVERIFY( !q.seek( QSql::BeforeFirstRow ) );
- QCOMPARE( q.at(), int( QSql::BeforeFirstRow ) );
- QVERIFY( q.seek( 0 ) );
- QCOMPARE( q.at(), 0 );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
-
- QVERIFY( q.seek( 1 ) );
- QCOMPARE( q.at(), 1 );
- QCOMPARE( q.value( 0 ).toInt(), 2 );
-
- QVERIFY( q.seek( 3 ) );
- QCOMPARE( q.at(), 3 );
- QCOMPARE( q.value( 0 ).toInt(), 4 );
-
- QVERIFY( q.seek( -2, true ) );
- QCOMPARE( q.at(), 1 );
- QVERIFY( q.seek( 0 ) );
- QCOMPARE( q.at(), 0 );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
+ QVERIFY(q.last());
+ QVERIFY(!q.seek(QSql::BeforeFirstRow));
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.seek(0));
+ QCOMPARE(q.at(), 0);
+ QCOMPARE(q.value(0).toInt(), 1);
+
+ QVERIFY(q.seek(1));
+ QCOMPARE(q.at(), 1);
+ QCOMPARE(q.value(0).toInt(), 2);
+
+ QVERIFY(q.seek(3));
+ QCOMPARE(q.at(), 3);
+ QCOMPARE(q.value(0).toInt(), 4);
+
+ QVERIFY(q.seek(-2, true));
+ QCOMPARE(q.at(), 1);
+ QVERIFY(q.seek(0));
+ QCOMPARE(q.at(), 0);
+ QCOMPARE(q.value(0).toInt(), 1);
QVERIFY(!q.seek(QSql::BeforeFirstRow));
- QCOMPARE(q.at(), int(QSql::BeforeFirstRow));
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
QVERIFY(q.seek(1, true));
QCOMPARE(q.at(), 0);
QCOMPARE(q.value(0).toInt(), 1);
qint32 count = 1;
- while (q.next()) ++count;
+ while (q.next())
+ ++count;
- QCOMPARE(q.at(), int(QSql::AfterLastRow));
+ QCOMPARE(q.at(), QSql::AfterLastRow);
if (!q.isForwardOnly()) {
QVERIFY(q.seek(-1, true));
@@ -1394,137 +1399,128 @@ void tst_QSqlQuery::seek()
QCOMPARE(q.value(0).toInt(), count);
} else {
QVERIFY(!q.seek(-1, true));
- QCOMPARE(q.at(), int(QSql::AfterLastRow));
+ QCOMPARE(q.at(), QSql::AfterLastRow);
}
}
void tst_QSqlQuery::seekForwardOnlyQuery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
- q.setForwardOnly( false );
- QVERIFY( !q.isForwardOnly() );
+ QSqlQuery q(db);
+ q.setForwardOnly(false);
+ QVERIFY(!q.isForwardOnly());
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( QString( "select id from %1 order by id" ).arg( qtest ) ) );
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec(QLatin1String("select id from %1 order by id").arg(qtest)));
QSqlRecord rec;
// NB! The order of the calls below are important!
- QVERIFY( q.seek( 0 ) );
- QCOMPARE( q.at(), 0 );
+ QVERIFY(q.seek(0));
+ QCOMPARE(q.at(), 0);
rec = q.record();
- QCOMPARE( rec.value( 0 ).toInt(), 1 );
+ QCOMPARE(rec.value(0).toInt(), 1);
- QVERIFY( q.seek( 1 ) );
- QCOMPARE( q.at(), 1 );
+ QVERIFY(q.seek(1));
+ QCOMPARE(q.at(), 1);
rec = q.record();
- QCOMPARE( rec.value( 0 ).toInt(), 2 );
+ QCOMPARE(rec.value(0).toInt(), 2);
// Make a jump!
- QVERIFY( q.seek( 3 ) );
- QCOMPARE( q.at(), 3 );
+ QVERIFY(q.seek(3));
+ QCOMPARE(q.at(), 3);
rec = q.record();
- QCOMPARE( rec.value( 0 ).toInt(), 4 );
+ QCOMPARE(rec.value(0).toInt(), 4);
// Last record in result set
- QVERIFY( q.seek( 4 ) );
- QCOMPARE( q.at(), 4 );
+ QVERIFY(q.seek(4));
+ QCOMPARE(q.at(), 4);
rec = q.record();
- QCOMPARE( rec.value( 0 ).toInt(), 5 );
+ QCOMPARE(rec.value(0).toInt(), 5);
}
-// tests the forward only mode;
void tst_QSqlQuery::forwardOnly()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- q.setForwardOnly( true );
- QVERIFY( q.isForwardOnly() );
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY_SQL( q, exec( "select * from " + qtest + " order by id" ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ q.setForwardOnly(true);
+ QVERIFY(q.isForwardOnly());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY_SQL(q, exec(QLatin1String("select * from %1 order by id").arg(qtest)));
if (!q.isForwardOnly())
QSKIP("DBMS doesn't support forward-only queries");
- QVERIFY( q.at() == QSql::BeforeFirstRow );
- QVERIFY( q.first() );
- QCOMPARE( q.at(), 0 );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QVERIFY( q.next() );
- QCOMPARE( q.at(), 1 );
- QCOMPARE( q.value( 0 ).toInt(), 2 );
- QVERIFY( q.next() );
- QCOMPARE( q.at(), 2 );
- QCOMPARE( q.value( 0 ).toInt(), 3 );
-
- // lets make some mistakes to see how robust it is
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query" );
- QVERIFY( q.first() == false );
- QCOMPARE( q.at(), 2 );
- QCOMPARE( q.value( 0 ).toInt(), 3 );
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query" );
- QVERIFY( q.previous() == false );
- QCOMPARE( q.at(), 2 );
- QCOMPARE( q.value( 0 ).toInt(), 3 );
- QVERIFY( q.next() );
- QCOMPARE( q.at(), 3 );
- QCOMPARE( q.value( 0 ).toInt(), 4 );
-
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- int i = 0;
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.first());
+ QCOMPARE(q.at(), 0);
+ QCOMPARE(q.value(0).toInt(), 1);
+ QVERIFY(q.next());
+ QCOMPARE(q.at(), 1);
+ QCOMPARE(q.value(0).toInt(), 2);
+ QVERIFY(q.next());
+ QCOMPARE(q.at(), 2);
+ QCOMPARE(q.value(0).toInt(), 3);
- while ( q.next() )
- i++;
+ // Let's make some mistakes to see how robust it is:
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.first());
+ QCOMPARE(q.at(), 2);
+ QCOMPARE(q.value(0).toInt(), 3);
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.previous());
+ QCOMPARE(q.at(), 2);
+ QCOMPARE(q.value(0).toInt(), 3);
+ QVERIFY(q.next());
+ QCOMPARE(q.at(), 3);
+ QCOMPARE(q.value(0).toInt(), 4);
+
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+
+ int i = 0;
+ while (q.next())
+ ++i;
- QVERIFY( q.at() == QSql::AfterLastRow );
+ QCOMPARE(q.at(), QSql::AfterLastRow);
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QSqlQuery q2 = q;
QT_WARNING_POP
- QVERIFY( q2.isForwardOnly() );
-
- QVERIFY_SQL( q, exec( "select * from " + qtest + " order by id" ) );
-
- QVERIFY( q.isForwardOnly() );
-
- QVERIFY( q2.isForwardOnly() );
-
- QCOMPARE( q.at(), int( QSql::BeforeFirstRow ) );
+ QVERIFY(q2.isForwardOnly());
- QVERIFY_SQL( q, seek( 3 ) );
+ QVERIFY_SQL(q, exec(QLatin1String("select * from %1 order by id").arg(qtest)));
+ QVERIFY(q.isForwardOnly());
+ QVERIFY(q2.isForwardOnly());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
- QCOMPARE( q.at(), 3 );
-
- QCOMPARE( q.value( 0 ).toInt(), 4 );
-
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query" );
-
- QVERIFY( q.seek( 0 ) == false );
-
- QCOMPARE( q.value( 0 ).toInt(), 4 );
-
- QCOMPARE( q.at(), 3 );
-
- QVERIFY( q.last() );
-
- QCOMPARE( q.at(), i-1 );
-
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query" );
+ QVERIFY_SQL(q, seek(3));
+ QCOMPARE(q.at(), 3);
+ QCOMPARE(q.value(0).toInt(), 4);
- QVERIFY( q.first() == false );
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.seek(0));
+ QCOMPARE(q.value(0).toInt(), 4);
+ QCOMPARE(q.at(), 3);
- QCOMPARE( q.at(), i-1 );
+ QVERIFY(q.last());
+ QCOMPARE(q.at(), i - 1);
- QVERIFY( q.next() == false );
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.first());
+ QCOMPARE(q.at(), i - 1);
- QCOMPARE( q.at(), int( QSql::AfterLastRow ) );
+ QVERIFY(!q.next());
+ QCOMPARE(q.at(), QSql::AfterLastRow);
}
void tst_QSqlQuery::forwardOnlyMultipleResultSet()
@@ -1533,36 +1529,38 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
-
if (!db.driver()->hasFeature(QSqlDriver::MultipleResultSets))
QSKIP("DBMS doesn't support multiple result sets");
QSqlQuery q(db);
q.setForwardOnly(true);
- QVERIFY_SQL(q, exec("select id, t_varchar from " + qtest + " order by id;" // 1.
- "select id, t_varchar, t_char from " + qtest + " where id<4 order by id;" // 2.
- "update " + qtest + " set t_varchar='VarChar555' where id=5;" // 3.
- "select * from " + qtest + " order by id;" // 4.
- "select * from " + qtest + " where id=5 order by id;" // 5.
- "select * from " + qtest + " where id=-1 order by id;" // 6.
- "select * from " + qtest + " order by id")); // 7.
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "select id, t_varchar from %1 order by id;" // 1.
+ "select id, t_varchar, t_char from %1 where id<4 order by id;" // 2.
+ "update %1 set t_varchar='VarChar555' where id=5;" // 3.
+ "select * from %1 order by id;" // 4.
+ "select * from %1 where id=5 order by id;" // 5.
+ "select * from %1 where id=-1 order by id;" // 6.
+ "select * from %1 order by id") // 7.
+ .arg(qtest)));
if (!q.isForwardOnly())
QSKIP("DBMS doesn't support forward-only queries");
// 1. Result set with 2 columns and 5 rows
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
// Test record() of first result set
QSqlRecord record = q.record();
QCOMPARE(record.count(), 2);
QCOMPARE(record.indexOf("id"), 0);
QCOMPARE(record.indexOf("t_varchar"), 1);
- if (dbType != QSqlDriver::PostgreSQL) { // 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
+ // tableName() is not available in forward-only mode of QPSQL
+ 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);
}
@@ -1579,18 +1577,21 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QCOMPARE(q.at(), 3);
QCOMPARE(q.value(0).toInt(), 4);
- QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query");
- QVERIFY(q.first() == false);
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.first());
QCOMPARE(q.at(), 3);
QCOMPARE(q.value(0).toInt(), 4);
- QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query");
- QVERIFY(q.previous() == false);
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.previous());
QCOMPARE(q.at(), 3);
QCOMPARE(q.value(0).toInt(), 4);
- QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::seek: cannot seek backwards in a forward only query");
- QVERIFY(q.seek(1) == false);
+ QTest::ignoreMessage(QtWarningMsg,
+ "QSqlQuery::seek: cannot seek backwards in a forward only query");
+ QVERIFY(!q.seek(1));
QCOMPARE(q.at(), 3);
QCOMPARE(q.value(0).toInt(), 4);
@@ -1598,15 +1599,15 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QCOMPARE(q.at(), 4);
// Try move after last row
- QVERIFY(q.next() == false);
+ QVERIFY(!q.next());
QCOMPARE(q.at(), QSql::AfterLastRow);
- QCOMPARE(q.isActive(), true);
+ QVERIFY(q.isActive());
// 2. Result set with 3 columns and 3 rows
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
// Test record() of second result set
record = q.record();
@@ -1616,28 +1617,28 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
QCOMPARE(record.indexOf("t_char"), 2);
// Test iteration
- QVERIFY(q.at() == QSql::BeforeFirstRow);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
int index = 0;
while (q.next()) {
QCOMPARE(q.at(), index);
- QCOMPARE(q.value(0).toInt(), index+1);
- index++;
+ QCOMPARE(q.value(0).toInt(), index + 1);
+ ++index;
}
- QVERIFY(q.at() == QSql::AfterLastRow);
+ QCOMPARE(q.at(), QSql::AfterLastRow);
QCOMPARE(index, 3);
// 3. Update statement
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), false);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(!q.isSelect());
QCOMPARE(q.numRowsAffected(), 1);
// 4. Result set with 5 rows
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
// Test forward seek(n)
QVERIFY(q.seek(2));
@@ -1654,38 +1655,38 @@ void tst_QSqlQuery::forwardOnlyMultipleResultSet()
// 5. Result set with 1 row
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
QVERIFY(q.first());
QCOMPARE(q.at(), 0);
QCOMPARE(q.value(0).toInt(), 5);
- QVERIFY(q.next() == false);
- QVERIFY(q.at() == QSql::AfterLastRow);
+ QVERIFY(!q.next());
+ QCOMPARE(q.at(), QSql::AfterLastRow);
// 6. Result set without rows
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
- QVERIFY(q.next() == false);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
+ QVERIFY(!q.next());
// 7. Result set with 5 rows
QVERIFY(q.nextResult());
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
// Just skip it, so we move after last result set.
- QVERIFY(q.nextResult() == false);
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), false);
+ QVERIFY(!q.nextResult());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(!q.isActive());
// See if we can execute another query
- QVERIFY_SQL(q, exec("select id from " + qtest + " where id=5"));
- QVERIFY(q.at() == QSql::BeforeFirstRow);
- QCOMPARE(q.isActive(), true);
- QCOMPARE(q.isSelect(), true);
+ QVERIFY_SQL(q, exec(QLatin1String("select id from %1 where id=5").arg(qtest)));
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.isActive());
+ QVERIFY(q.isSelect());
QVERIFY(q.first());
QCOMPARE(q.at(), 0);
QCOMPARE(q.value("id").toInt(), 5);
@@ -1701,7 +1702,7 @@ void tst_QSqlQuery::psql_forwardOnlyQueryResultsLost()
QSqlQuery q1(db);
q1.setForwardOnly(true);
- QVERIFY_SQL(q1, exec("select * from " + qtest + " where id<=3 order by id"));
+ QVERIFY_SQL(q1, exec(QLatin1String("select * from %1 where id<=3 order by id").arg(qtest)));
if (!q1.isForwardOnly())
QSKIP("DBMS doesn't support forward-only queries");
@@ -1714,7 +1715,7 @@ void tst_QSqlQuery::psql_forwardOnlyQueryResultsLost()
// will cause the query results of q1 to be lost.
QSqlQuery q2(db);
q2.setForwardOnly(true);
- QVERIFY_SQL(q2, exec("select * from " + qtest + " where id>3 order by id"));
+ QVERIFY_SQL(q2, exec(QLatin1String("select * from %1 where id>3 order by id").arg(qtest)));
QTest::ignoreMessage(QtWarningMsg, "QPSQLDriver::getResult: Query results lost - "
"probably discarded on executing another SQL query.");
@@ -1732,45 +1733,47 @@ void tst_QSqlQuery::psql_forwardOnlyQueryResultsLost()
void tst_QSqlQuery::query_exec()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY( !q.isValid() );
- QVERIFY( !q.isActive() );
- QVERIFY_SQL( q, exec( "select * from " + qtest ) );
- QVERIFY( q.isActive() );
- QVERIFY( q.next() );
- QVERIFY( q.isValid() );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QVERIFY(!q.isValid());
+ QVERIFY(!q.isActive());
+ QVERIFY_SQL(q, exec("select * from " + qtest));
+ QVERIFY(q.isActive());
+ QVERIFY(q.next());
+ QVERIFY(q.isValid());
}
void tst_QSqlQuery::isNull()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY_SQL(q, exec("select id, t_varchar from " + qTableName("qtest_null", __FILE__, db) + " order by id"));
- QVERIFY( q.next() );
- QVERIFY( !q.isNull( 0 ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String("select id, t_varchar from %1 order by id")
+ .arg(qTableName("qtest_null", __FILE__, db))));
+ QVERIFY(q.next());
+ QVERIFY(!q.isNull(0));
QVERIFY(!q.isNull("id"));
- QVERIFY( q.isNull( 1 ) );
+ QVERIFY(q.isNull(1));
QVERIFY(q.isNull("t_varchar"));
- QCOMPARE( q.value( 0 ).toInt(), 0 );
- QCOMPARE( q.value( 1 ).toString(), QString() );
- QVERIFY( !q.value( 0 ).isNull() );
- QVERIFY( q.value( 1 ).isNull() );
+ QCOMPARE(q.value(0).toInt(), 0);
+ QCOMPARE(q.value(1).toString(), QString());
+ QVERIFY(!q.value(0).isNull());
+ QVERIFY(q.value(1).isNull());
- QVERIFY( q.next() );
- QVERIFY( !q.isNull( 0 ) );
+ QVERIFY(q.next());
+ QVERIFY(!q.isNull(0));
QVERIFY(!q.isNull("id"));
- QVERIFY( !q.isNull( 1 ) );
+ QVERIFY(!q.isNull(1));
QVERIFY(!q.isNull("t_varchar"));
// For a non existent field, it should be returning true.
QVERIFY(q.isNull(2));
+ QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::isNull: unknown field name 'unknown'");
QVERIFY(q.isNull("unknown"));
}
@@ -1784,12 +1787,12 @@ void tst_QSqlQuery::writeNull()
QSqlQuery q(db);
const QString tableName = qTableName("qtest_writenull", __FILE__, db);
- // the test data table is already used, so use a local hash to exercise the various
+ // The test data table is already used, so use a local hash to exercise the various
// cases from the QSqlResultPrivate::isVariantNull helper. Only PostgreSQL supports
// QUuid.
QMultiHash<QString, QVariant> nullableTypes = {
- {"varchar(20)", QString("not null")},
- {"varchar(20)", QByteArray("not null")},
+ {"varchar(20)", u"not null"_s},
+ {"varchar(20)", "not null"_ba},
{"date", QDateTime::currentDateTime()},
{"date", QDate::currentDate()},
{"date", QTime::currentTime()},
@@ -1800,7 +1803,7 @@ void tst_QSqlQuery::writeNull()
// Helper to count rows with null values in the data column.
// Since QSqlDriver::QuerySize might not be supported, we have to count anyway
const auto countRowsWithNull = [&]{
- q.exec("select id, data from " + tableName + " where data is null");
+ q.exec(QLatin1String("select id, data from %1 where data is null").arg(tableName));
int size = 0;
while (q.next())
++size;
@@ -1808,7 +1811,7 @@ void tst_QSqlQuery::writeNull()
};
for (const auto &nullableType : nullableTypes.keys()) {
- auto tableGuard = qScopeGuard([&]{
+ const auto tableGuard = qScopeGuard([&]{
q.exec("drop table " + tableName);
});
const QVariant nonNullValue = nullableTypes.value(nullableType);
@@ -1819,165 +1822,167 @@ void tst_QSqlQuery::writeNull()
while (q.next())
qWarning() << q.value(0) << q.value(1);
});
- QString createQuery = "create table " + tableName + " (id int, data " + nullableType;
- if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase)
- createQuery += " null";
- createQuery += ")";
+ QString createQuery = QLatin1String("create table %3 (id int, data %1%2)")
+ .arg(nullableType,
+ dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase ? " null" : "",
+ tableName);
QVERIFY_SQL(q, exec(createQuery));
int expectedNullCount = 0;
- // verify that inserting a non-null value works
- QVERIFY_SQL(q, prepare("insert into " + tableName + " values(:id, :data)"));
+ // Verify that inserting a non-null value works:
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 values(:id, :data)").arg(tableName)));
q.bindValue(":id", expectedNullCount);
q.bindValue(":data", nonNullValue);
QVERIFY_SQL(q, exec());
QCOMPARE(countRowsWithNull(), expectedNullCount);
- // verify that inserting using a null QVariant produces a null entry in the database
- QVERIFY_SQL(q, prepare("insert into " + tableName + " values(:id, :data)"));
+ // Verify that inserting using a null QVariant produces a null entry in the database:
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 values(:id, :data)").arg(tableName)));
q.bindValue(":id", ++expectedNullCount);
q.bindValue(":data", QVariant());
QVERIFY_SQL(q, exec());
QCOMPARE(countRowsWithNull(), expectedNullCount);
- // verify that writing a null-value (but not a null-variant) produces a null entry in the database
+ // Verify that writing a null-value (but not a null-variant) produces a
+ // null entry in the database:
const QMetaType nullableMetaType = nullableTypes.value(nullableType).metaType();
- // creating a QVariant with meta type and nullptr does create a null-QVariant. We want
+ // Creating a QVariant with meta type and nullptr does create a null-QVariant. We want
// to explicitly create a non-null variant, so we have to pass in a default-constructed
// value as well (and make sure that the default value is also destroyed again,
// which is clumsy to do using std::unique_ptr with a custom deleter, so use another
// scope guard).
- void* defaultData = nullableMetaType.create();
+ void *defaultData = nullableMetaType.create();
const auto defaultTypeDeleter = qScopeGuard([&]{ nullableMetaType.destroy(defaultData); });
const QVariant nullValueVariant(nullableMetaType, defaultData);
QVERIFY(!nullValueVariant.isNull());
- QVERIFY_SQL(q, prepare("insert into " + tableName + " values(:id, :data)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 values(:id, :data)").arg(tableName)));
q.bindValue(":id", ++expectedNullCount);
q.bindValue(":data", nullValueVariant);
QVERIFY_SQL(q, exec());
QCOMPARE(countRowsWithNull(), expectedNullCount);
- // all tests passed for this type if we got here, so don't print diagnostics
+ // All tests passed for this type if we got here, so don't print diagnostics:
errorHandler.dismiss();
}
}
-/*! TDS specific BIT field test */
+// TDS-specific BIT field test:
void tst_QSqlQuery::tds_bitField()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString tableName = qTableName("qtest_bittest", __FILE__, db);
- QSqlQuery q( db );
-
- QVERIFY_SQL(q, exec("create table " + tableName + " (bitty bit)"));
-
- QVERIFY_SQL(q, exec("insert into " + tableName + " values (0)"));
-
- QVERIFY_SQL(q, exec("insert into " + tableName + " values (1)"));
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (bitty bit)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (0)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1)").arg(tableName)));
QVERIFY_SQL(q, exec("select bitty from " + tableName));
- QVERIFY( q.next() );
-
- QVERIFY( q.value( 0 ).toInt() == 0 );
-
- QVERIFY( q.next() );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 0);
- QVERIFY( q.value( 0 ).toInt() == 1 );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
}
-
-/*! Oracle specific NULL BLOB test */
+// Oracle-specific NULL BLOB test:
void tst_QSqlQuery::oci_nullBlob()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString qtest_nullblob(qTableName("qtest_nullblob", __FILE__, db));
- QSqlQuery q( db );
- QVERIFY_SQL( q, exec( "create table " + qtest_nullblob + " (id int primary key, bb blob)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_nullblob + " values (0, EMPTY_BLOB())" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_nullblob + " values (1, NULL)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_nullblob + " values (2, 'aabbcc00112233445566')" ) );
- // necessary otherwise oracle will bombard you with internal errors
- q.setForwardOnly( true );
- QVERIFY_SQL( q, exec( "select * from " + qtest_nullblob + " order by id" ) );
-
- QVERIFY( q.next() );
- QCOMPARE(( int )q.value( 1 ).toByteArray().size(), 0 );
- QVERIFY( !q.isNull( 1 ) );
-
- QVERIFY( q.next() );
- QCOMPARE(( int )q.value( 1 ).toByteArray().size(), 0 );
- QVERIFY( q.isNull( 1 ) );
-
- QVERIFY( q.next() );
- QCOMPARE(( int )q.value( 1 ).toByteArray().size(), 10 );
- QVERIFY( !q.isNull( 1 ) );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int primary key, bb blob)")
+ .arg(qtest_nullblob)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (0, EMPTY_BLOB())")
+ .arg(qtest_nullblob)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, NULL)").arg(qtest_nullblob)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (2, 'aabbcc00112233445566')")
+ .arg(qtest_nullblob)));
+ // Necessary otherwise Oracle will bombard you with internal errors:
+ q.setForwardOnly(true);
+ QVERIFY_SQL(q, exec(QLatin1String("select * from %1 order by id").arg(qtest_nullblob)));
+
+ QVERIFY(q.next());
+ QVERIFY(q.value(1).toByteArray().isEmpty());
+ QVERIFY(!q.isNull(1));
+
+ QVERIFY(q.next());
+ QVERIFY(q.value(1).toByteArray().isEmpty());
+ QVERIFY(q.isNull(1));
+
+ QVERIFY(q.next());
+ QCOMPARE(q.value(1).toByteArray().size(), qsizetype(10));
+ QVERIFY(!q.isNull(1));
}
-/* Oracle specific RAW field test */
+/* Oracle-specific RAW field test */
void tst_QSqlQuery::oci_rawField()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString qtest_rawtest(qTableName("qtest_rawtest", __FILE__, db));
- QSqlQuery q( db );
- q.setForwardOnly( true );
- QVERIFY_SQL( q, exec( "create table " + qtest_rawtest +
- " (id int, col raw(20))" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_rawtest + " values (0, NULL)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtest_rawtest + " values (1, '00aa1100ddeeff')" ) );
- QVERIFY_SQL( q, exec( "select col from " + qtest_rawtest + " order by id" ) );
- QVERIFY( q.next() );
- QVERIFY( q.isNull( 0 ) );
- QCOMPARE(( int )q.value( 0 ).toByteArray().size(), 0 );
- QVERIFY( q.next() );
- QVERIFY( !q.isNull( 0 ) );
- QCOMPARE(( int )q.value( 0 ).toByteArray().size(), 7 );
+ QSqlQuery q(db);
+ q.setForwardOnly(true);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int, col raw(20))").arg(qtest_rawtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (0, NULL)").arg(qtest_rawtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, '00aa1100ddeeff')")
+ .arg(qtest_rawtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("select col from %1 order by id").arg(qtest_rawtest)));
+ QVERIFY(q.next());
+ QVERIFY(q.isNull(0));
+ QVERIFY(q.value(0).toByteArray().isEmpty());
+ QVERIFY(q.next());
+ QVERIFY(!q.isNull(0));
+ QCOMPARE(q.value(0).toByteArray().size(), qsizetype(7));
}
-// test whether we can fetch values with more than DOUBLE precision
+// Test whether we can fetch values with more than DOUBLE precision
// note that SQLite highest precision is that of a double, although
-// you can define field with higher precision
+// you can define field with higher precision:
void tst_QSqlQuery::precision()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::Interbase)
QSKIP("DB unable to store high precision");
- const auto oldPrecision = db.driver()->numericalPrecisionPolicy();
+ const auto tidier = qScopeGuard([db, oldPrecision = db.driver()->numericalPrecisionPolicy()]() {
+ db.driver()->setNumericalPrecisionPolicy(oldPrecision);
+ });
+
db.driver()->setNumericalPrecisionPolicy(QSql::HighPrecision);
const QString qtest_precision(qTableName("qtest_precision", __FILE__, db));
static const QLatin1String precStr("1.2345678901234567891");
{
// need a new scope for SQLITE
- QSqlQuery q( db );
+ QSqlQuery q(db);
q.exec("drop table " + qtest_precision);
- if (tst_Databases::isMSAccess(db))
- QVERIFY_SQL(q, exec("CREATE TABLE " + qtest_precision + " (col1 number)"));
- else
- QVERIFY_SQL(q, exec("CREATE TABLE " + qtest_precision + " (col1 numeric(21, 20))"));
+ QVERIFY_SQL(q, exec(QLatin1String(tst_Databases::isMSAccess(db)
+ ? "CREATE TABLE %1 (col1 number)"
+ : "CREATE TABLE %1 (col1 numeric(21, 20))")
+ .arg(qtest_precision)));
- QVERIFY_SQL(q, exec("INSERT INTO " + qtest_precision + " (col1) VALUES (" + precStr + ")"));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (col1) VALUES (%2)")
+ .arg(qtest_precision, precStr)));
QVERIFY_SQL(q, exec("SELECT * FROM " + qtest_precision));
QVERIFY(q.next());
const QString val = q.value(0).toString();
if (!val.startsWith(precStr)) {
int i = 0;
while (i < val.size() && precStr[i] != 0 && precStr[i] == val[i].toLatin1())
- i++;
+ ++i;
// TDS has crappy precisions by default
if (dbType == QSqlDriver::Sybase) {
@@ -1989,374 +1994,380 @@ void tst_QSqlQuery::precision()
}
}
} // SQLITE scope
- db.driver()->setNumericalPrecisionPolicy(oldPrecision);
}
void tst_QSqlQuery::nullResult()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY_SQL( q, exec( "select * from " + qtest + " where id > 50000" ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- if ( q.driver()->hasFeature( QSqlDriver::QuerySize ) )
- QCOMPARE( q.size(), 0 );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String("select * from %1 where id > 50000").arg(qtest)));
- QVERIFY( q.next() == false );
+ if (q.driver()->hasFeature(QSqlDriver::QuerySize))
+ QCOMPARE(q.size(), 0);
- QVERIFY( q.first() == false );
- QVERIFY( q.last() == false );
- QVERIFY( q.previous() == false );
- QVERIFY( q.seek( 10 ) == false );
- QVERIFY( q.seek( 0 ) == false );
+ QVERIFY(!q.next());
+ QVERIFY(!q.first());
+ QVERIFY(!q.last());
+ QVERIFY(!q.previous());
+ QVERIFY(!q.seek(10));
+ QVERIFY(!q.seek(0));
}
-// this test is just an experiment to see whether we can do query-based transactions
-// the real transaction test is in tst_QSqlDatabase
+// This test is just an experiment to see whether we can do query-based transactions.
+// The real transaction test is in tst_QSqlDatabase.
void tst_QSqlQuery::transaction()
{
- // query based transaction is not really possible with Qt
- QSKIP( "only tested manually by trained staff");
+ // Query-based transaction is not really possible with Qt:
+ QSKIP("only tested manually by trained staff");
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if ( !db.driver()->hasFeature( QSqlDriver::Transactions ) )
- QSKIP( "DBMS not transaction capable");
+ if (!db.driver()->hasFeature(QSqlDriver::Transactions))
+ QSKIP("DBMS not transaction-capable");
- // this is the standard SQL
- QString startTransactionStr( "start transaction" );
+ // This is the standard SQL:
+ QString startTransactionStr("start transaction");
if (dbType == QSqlDriver::MySqlServer)
startTransactionStr = "begin work";
- QSqlQuery q( db );
-
- QSqlQuery q2( db );
-
- // test a working transaction
- q.exec( startTransactionStr );
-
- QVERIFY_SQL( q, exec( "insert into" + qtest + " values (40, 'VarChar40', 'Char40')" ) );
-
- QVERIFY_SQL( q, exec( "select * from" + qtest + " where id = 40" ) );
-
- QVERIFY( q.next() );
-
- QCOMPARE( q.value( 0 ).toInt(), 40 );
-
- QVERIFY_SQL( q, exec( "commit" ) );
-
- QVERIFY_SQL( q, exec( "select * from" + qtest + " where id = 40" ) );
-
- QVERIFY( q.next() );
+ QSqlQuery q(db);
+ QSqlQuery q2(db);
- QCOMPARE( q.value( 0 ).toInt(), 40 );
+ // Test a working transaction:
+ q.exec(startTransactionStr);
+ QVERIFY_SQL(q, exec(QLatin1String("insert into%1 values (40, 'VarChar40', 'Char40')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("select * from%1 where id = 40").arg(qtest)));
- // test a rollback
- q.exec( startTransactionStr );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 40);
- QVERIFY_SQL( q, exec( "insert into" + qtest + " values (41, 'VarChar41', 'Char41')" ) );
+ QVERIFY_SQL(q, exec("commit"));
+ QVERIFY_SQL(q, exec(QLatin1String("select * from%1 where id = 40").arg(qtest)));
- QVERIFY_SQL( q, exec( "select * from" + qtest + " where id = 41" ) );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 40);
- QVERIFY( q.next() );
+ // Test a rollback:
+ q.exec(startTransactionStr);
+ QVERIFY_SQL(q, exec(QLatin1String("insert into%1 values (41, 'VarChar41', 'Char41')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("select * from%1 where id = 41").arg(qtest)));
- QCOMPARE( q.value( 0 ).toInt(), 41 );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 41);
- if ( !q.exec( "rollback" ) ) {
+ if (!q.exec("rollback")) {
if (dbType == QSqlDriver::MySqlServer) {
- qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) ));
- QSKIP( "MySQL transaction failed "); //non-fatal
- } else
- QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) );
+ qDebug("MySQL: %s", qPrintable(tst_Databases::printError(q.lastError())));
+ QSKIP("MySQL transaction failed "); // non-fatal
+ } else {
+ QFAIL("Could not rollback transaction: " + tst_Databases::printError(q.lastError()));
+ }
}
+ QVERIFY_SQL(q, exec(QLatin1String("select * from%1 where id = 41").arg(qtest)));
+ QVERIFY(!q.next());
- QVERIFY_SQL( q, exec( "select * from" + qtest + " where id = 41" ) );
-
- QVERIFY( q.next() == false );
-
- // test concurrent access
- q.exec( startTransactionStr );
- QVERIFY_SQL( q, exec( "insert into" + qtest + " values (42, 'VarChar42', 'Char42')" ) );
- QVERIFY_SQL( q, exec( "select * from" + qtest + " where id = 42" ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 42 );
-
- QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) );
+ // Test concurrent access:
+ q.exec(startTransactionStr);
+ QVERIFY_SQL(q, exec(QLatin1String("insert into%1 values (42, 'VarChar42', 'Char42')")
+ .arg(qtest)));
+ QVERIFY_SQL(q, exec(QLatin1String("select * from%1 where id = 42").arg(qtest)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 42);
- if ( q2.next() )
+ QVERIFY_SQL(q2, exec(QLatin1String("select * from%1 where id = 42").arg(qtest)));
+ if (q2.next())
qDebug("DBMS '%s' doesn't support query based transactions with concurrent access",
- qPrintable(tst_Databases::dbToString( db )));
+ qPrintable(tst_Databases::dbToString(db)));
- QVERIFY_SQL( q, exec( "commit" ) );
+ QVERIFY_SQL(q, exec("commit"));
+ QVERIFY_SQL(q2, exec(QLatin1String("select * from%1 where id = 42").arg(qtest)));
- QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) );
-
- QVERIFY( q2.next() );
-
- QCOMPARE( q2.value( 0 ).toInt(), 42 );
+ QVERIFY(q2.next());
+ QCOMPARE(q2.value(0).toInt(), 42);
}
void tst_QSqlQuery::joins()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(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
- || dbType == QSqlDriver::Interbase || db.driverName().startsWith("QODBC"))
- // Oracle broken beyond recognition - cannot outer join on more than
- // one table.
- QSKIP( "DBMS cannot understand standard SQL");
-
- QSqlQuery q( db );
-
- QVERIFY_SQL( q, exec( "create table " + qtestj1 + " (id1 int, id2 int)" ) );
- QVERIFY_SQL( q, exec( "create table " + qtestj2 + " (id int, name varchar(20))" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtestj1 + " values (1, 1)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtestj1 + " values (1, 2)" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtestj2 + " values(1, 'trenton')" ) );
- QVERIFY_SQL( q, exec( "insert into " + qtestj2 + " values(2, 'marius')" ) );
-
- QVERIFY_SQL( q, exec( "select qtestj1.id1, qtestj1.id2, qtestj2.id, qtestj2.name, qtestj3.id, qtestj3.name "
- "from " + qtestj1 + " qtestj1 left outer join " + qtestj2 +
- " qtestj2 on (qtestj1.id1 = qtestj2.id) "
- "left outer join " + qtestj2 + " as qtestj3 on (qtestj1.id2 = qtestj3.id)" ) );
-
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toInt(), 1 );
- QCOMPARE( q.value( 2 ).toInt(), 1 );
- QCOMPARE( q.value( 3 ).toString(), QString( "trenton" ) );
- QCOMPARE( q.value( 4 ).toInt(), 1 );
- QCOMPARE( q.value( 5 ).toString(), QString( "trenton" ) );
-
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toInt(), 2 );
- QCOMPARE( q.value( 2 ).toInt(), 1 );
- QCOMPARE( q.value( 3 ).toString(), QString( "trenton" ) );
- QCOMPARE( q.value( 4 ).toInt(), 2 );
- QCOMPARE( q.value( 5 ).toString(), QString( "marius" ) );
+ || dbType == QSqlDriver::Interbase || db.driverName().startsWith("QODBC")) {
+ // Oracle broken beyond recognition - cannot outer join on more than one table:
+ QSKIP("DBMS cannot understand standard SQL");
+ }
+
+ QSqlQuery q(db);
+
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id1 int, id2 int)").arg(qtestj1)));
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int, name varchar(20))").arg(qtestj2)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, 1)").arg(qtestj1)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, 2)").arg(qtestj1)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values(1, 'trenton')").arg(qtestj2)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values(2, 'marius')").arg(qtestj2)));
+
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "select qtestj1.id1, qtestj1.id2, qtestj2.id, qtestj2.name, "
+ "qtestj3.id, qtestj3.name from %1 qtestj1 left outer join %2 qtestj2 "
+ "on (qtestj1.id1 = qtestj2.id) left outer join %2 as qtestj3 "
+ "on (qtestj1.id2 = qtestj3.id)").arg(qtestj1, qtestj2)));
+
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toInt(), 1);
+ QCOMPARE(q.value(2).toInt(), 1);
+ QCOMPARE(q.value(3).toString(), u"trenton");
+ QCOMPARE(q.value(4).toInt(), 1);
+ QCOMPARE(q.value(5).toString(), u"trenton");
+
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toInt(), 2);
+ QCOMPARE(q.value(2).toInt(), 1);
+ QCOMPARE(q.value(3).toString(), u"trenton");
+ QCOMPARE(q.value(4).toInt(), 2);
+ QCOMPARE(q.value(5).toString(), u"marius");
}
void tst_QSqlQuery::synonyms()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
- QVERIFY_SQL( q, exec("select a.id, a.t_char, a.t_varchar from " + qtest + " a where a.id = 1") );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toString().trimmed(), QString( "Char1" ) );
- QCOMPARE( q.value( 2 ).toString().trimmed(), QString( "VarChar1" ) );
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "select a.id, a.t_char, a.t_varchar from %1 a where a.id = 1")
+ .arg(qtest)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toString().trimmed(), u"Char1");
+ QCOMPARE(q.value(2).toString().trimmed(), u"VarChar1");
QSqlRecord rec = q.record();
- QCOMPARE(( int )rec.count(), 3 );
- QCOMPARE( rec.field( 0 ).name().toLower(), QString( "id" ) );
- QCOMPARE( rec.field( 1 ).name().toLower(), QString( "t_char" ) );
- QCOMPARE( rec.field( 2 ).name().toLower(), QString( "t_varchar" ) );
+ QCOMPARE(rec.count(), qsizetype(3));
+ QCOMPARE(rec.field(0).name().toLower(), u"id");
+ QCOMPARE(rec.field(1).name().toLower(), u"t_char");
+ QCOMPARE(rec.field(2).name().toLower(), u"t_varchar");
}
// It doesn't make sense to split this into several tests
void tst_QSqlQuery::prepare_bind_exec()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
const QString qtest_prepare(qTableName("qtest_prepare", __FILE__, db));
if (dbType == QSqlDriver::DB2)
QSKIP("Needs someone with more Unicode knowledge than I have to fix");
- {
- // new scope for SQLITE
- static const QString utf8str = QString::fromUtf8( "काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥" );
+ { // New scope for SQLITE:
+ static const QString utf8str = QString::fromUtf8("काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥");
- static const QString values[6] = { "Harry", "Trond", "Mark", "Ma?rk", "?", ":id" };
+ static const QString values[6] = {
+ u"Harry"_s, u"Trond"_s, u"Mark"_s, u"Ma?rk"_s, u"?"_s, u":id"_s
+ };
- bool useUnicode = db.driver()->hasFeature( QSqlDriver::Unicode );
+ bool useUnicode = db.driver()->hasFeature(QSqlDriver::Unicode);
- QSqlQuery q( db );
- QString createQuery;
+ QSqlQuery q(db);
+ QLatin1String createQuery;
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::PostgreSQL)
- QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
-
- if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase)
- createQuery = "create table " + qtest_prepare + " (id int primary key, name nvarchar(200) null, name2 nvarchar(200) null)";
- else if (dbType == QSqlDriver::MySqlServer && useUnicode)
- createQuery = "create table " + qtest_prepare + " (id int not null primary key, name varchar(200) character set utf8, name2 varchar(200) character set utf8)";
- else
- createQuery = "create table " + qtest_prepare + " (id int not null primary key, name varchar(200), name2 varchar(200))";
+ QVERIFY_SQL(q, exec("set client_min_messages='warning'"));
+
+ switch (dbType) {
+ case QSqlDriver::MSSqlServer:
+ case QSqlDriver::Sybase:
+ createQuery = QLatin1String("create table %1 (id int primary key, "
+ "name nvarchar(200) null, name2 nvarchar(200) null)");
+ break;
+ case QSqlDriver::MySqlServer:
+ if (useUnicode) {
+ createQuery = QLatin1String("create table %1 (id int not null primary key, "
+ "name varchar(200) character set utf8, "
+ "name2 varchar(200) character set utf8)");
+ break;
+ }
+ Q_FALLTHROUGH();
+ default:
+ createQuery = QLatin1String("create table %1 (id int not null primary key, "
+ "name varchar(200), name2 varchar(200))");
+ break;
+ }
q.exec("drop table " + qtest_prepare);
- QVERIFY_SQL( q, exec( createQuery ) );
-
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name) values (:id, :name)" ) );
+ QVERIFY_SQL(q, exec(createQuery.arg(qtest_prepare)));
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name) values (:id, :name)")
+ .arg(qtest_prepare)));
int i;
- for ( i = 0; i < 6; ++i ) {
- q.bindValue( ":name", values[i] );
- q.bindValue( ":id", i );
- QVERIFY_SQL( q, exec() );
- QVariantList m = q.boundValues();
- QCOMPARE(( int ) m.count(), 2 );
+ for (i = 0; i < 6; ++i) {
+ q.bindValue(":name", values[i]);
+ q.bindValue(":id", i);
+ QVERIFY_SQL(q, exec());
+ const QVariantList m = q.boundValues();
+ QCOMPARE(m.count(), qsizetype(2));
QCOMPARE(m.at(0).toInt(), i);
QCOMPARE(m.at(1).toString(), values[i]);
}
- q.bindValue( ":id", 8 );
-
- QVERIFY_SQL( q, exec() );
+ q.bindValue(":id", 8);
+ QVERIFY_SQL(q, exec());
- if ( useUnicode ) {
- q.bindValue( ":id", 7 );
- q.bindValue( ":name", utf8str );
- QVERIFY_SQL( q, exec() );
+ if (useUnicode) {
+ q.bindValue(":id", 7);
+ q.bindValue(":name", utf8str);
+ QVERIFY_SQL(q, exec());
}
- QVERIFY_SQL( q, exec( "SELECT * FROM " + qtest_prepare + " order by id" ) );
-
- for ( i = 0; i < 6; ++i ) {
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( 1 ).toString().trimmed(), values[ i ] );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT * FROM %1 order by id").arg(qtest_prepare)));
+ for (i = 0; i < 6; ++i) {
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value(1).toString().trimmed(), values[i]);
}
- if ( useUnicode ) {
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 7 );
- QCOMPARE( q.value( 1 ).toString(), utf8str );
+ if (useUnicode) {
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 7);
+ QCOMPARE(q.value(1).toString(), utf8str);
}
- QVERIFY_SQL( q, next() );
-
- QCOMPARE( q.value( 0 ).toInt(), 8 );
- QCOMPARE( q.value( 1 ).toString(), values[5] );
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 8);
+ QCOMPARE(q.value(1).toString(), values[5]);
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name) values (:id, 'Bart')" ) );
- q.bindValue( ":id", 99 );
- QVERIFY_SQL( q, exec() );
- q.bindValue( ":id", 100 );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.exec( "select * from " + qtest_prepare + " where id > 98 order by id" ) );
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name) values (:id, 'Bart')")
+ .arg(qtest_prepare)));
+ q.bindValue(":id", 99);
+ QVERIFY_SQL(q, exec());
+ q.bindValue(":id", 100);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 98 order by id")
+ .arg(qtest_prepare)));
- for ( i = 99; i <= 100; ++i ) {
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( 1 ).toString().trimmed(), QString( "Bart" ) );
+ for (i = 99; i <= 100; ++i) {
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value(1).toString().trimmed(), u"Bart");
}
/*** SELECT stuff ***/
- QVERIFY( q.prepare( "select * from " + qtest_prepare + " where id = :id" ) );
-
- for ( i = 0; i < 6; ++i ) {
- q.bindValue( ":id", i );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( 1 ).toString().trimmed(), values[ i ] );
+ QVERIFY(q.prepare(QLatin1String("select * from %1 where id = :id").arg(qtest_prepare)));
+
+ for (i = 0; i < 6; ++i) {
+ q.bindValue(":id", i);
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value(1).toString().trimmed(), values[i]);
QSqlRecord rInf = q.record();
- QCOMPARE(( int )rInf.count(), 3 );
- QCOMPARE( rInf.field( 0 ).name().toUpper(), QString( "ID" ) );
- QCOMPARE( rInf.field( 1 ).name().toUpper(), QString( "NAME" ) );
- QVERIFY( !q.next() );
+ QCOMPARE(rInf.count(), qsizetype(3));
+ QCOMPARE(rInf.field(0).name().toUpper(), u"ID");
+ QCOMPARE(rInf.field(1).name().toUpper(), u"NAME");
+ QVERIFY(!q.next());
}
- QVERIFY_SQL( q, exec( "DELETE FROM " + qtest_prepare ) );
-
- /*** Below we test QSqlQuery::boundValues() with position arguments.
- * Due to the fact that the name of a positional argument is not
- * specified by the Qt docs, we test that the QList contains
- * the correct values in the same order as QSqlResult::boundValueName
- * returns since it should be in insertion order (i.e. field order). ***/
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name) values (?, ?)" ) );
- q.bindValue( 0, 0 );
- q.bindValue( 1, values[ 0 ] );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec("DELETE FROM " + qtest_prepare));
+
+ /* Below we test QSqlQuery::boundValues() with position arguments.
+ Due to the fact that the name of a positional argument is not
+ specified by the Qt docs, we test that the QList contains the correct
+ values in the same order as QSqlResult::boundValueName returns since
+ it should be in insertion order (i.e. field order). */
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name) values (?, ?)")
+ .arg(qtest_prepare)));
+ q.bindValue(0, 0);
+ q.bindValue(1, values[0]);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 0);
QCOMPARE(q.boundValues().at(1).toString(), values[0]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 0);
QCOMPARE(q.boundValues().at(1).toString(), values[0]);
- q.addBindValue( 1 );
- q.addBindValue( values[ 1 ] );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.addBindValue(1);
+ q.addBindValue(values[1]);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 1);
QCOMPARE(q.boundValues().at(1).toString(), values[1]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 1);
QCOMPARE(q.boundValues().at(1).toString(), values[1]);
- q.addBindValue( 2 );
- q.addBindValue( values[ 2 ] );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.addBindValue(2);
+ q.addBindValue(values[2]);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 2);
QCOMPARE(q.boundValues().at(1).toString(), values[2]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 2);
QCOMPARE(q.boundValues().at(1).toString(), values[2]);
- q.addBindValue( 3 );
- q.addBindValue( values[ 3 ] );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.addBindValue(3);
+ q.addBindValue(values[3]);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 3);
QCOMPARE(q.boundValues().at(1).toString(), values[3]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 3);
QCOMPARE(q.boundValues().at(1).toString(), values[3]);
- q.addBindValue( 4 );
- q.addBindValue( values[ 4 ] );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.addBindValue(4);
+ q.addBindValue(values[4]);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 4);
QCOMPARE(q.boundValues().at(1).toString(), values[4]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 4);
QCOMPARE(q.boundValues().at(1).toString(), values[4]);
- q.bindValue( 1, values[ 5 ] );
- q.bindValue( 0, 5 );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.bindValue(1, values[5]);
+ q.bindValue(0, 5);
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 5);
QCOMPARE(q.boundValues().at(1).toString(), values[5]);
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 5);
QCOMPARE(q.boundValues().at(1).toString(), values[5]);
- q.bindValue( 0, 6 );
- q.bindValue( 1, QString() );
- QCOMPARE( q.boundValues().size(), 2 );
+ q.bindValue(0, 6);
+ q.bindValue(1, QString());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 6);
QCOMPARE(q.boundValues().at(1).toString(), QString());
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.boundValues().size(), 2 );
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.boundValues().size(), 2);
QCOMPARE(q.boundValues().at(0).toInt(), 6);
QCOMPARE(q.boundValues().at(1).toString(), QString());
- if ( db.driver()->hasFeature( QSqlDriver::Unicode ) ) {
- q.bindValue( 0, 7 );
- q.bindValue( 1, utf8str );
+ if (db.driver()->hasFeature(QSqlDriver::Unicode)) {
+ q.bindValue(0, 7);
+ q.bindValue(1, utf8str);
QCOMPARE(q.boundValues().at(0).toInt(), 7);
QCOMPARE(q.boundValues().at(1).toString(), utf8str);
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
QCOMPARE(q.boundValues().at(0).toInt(), 7);
QCOMPARE(q.boundValues().at(1).toString(), utf8str);
}
@@ -2371,234 +2382,228 @@ void tst_QSqlQuery::prepare_bind_exec()
QCOMPARE(q.boundValues().at(2).toInt(), 10);
QFAIL_SQL(q, exec());
- QVERIFY_SQL( q, exec( "SELECT * FROM " + qtest_prepare + " order by id" ) );
-
- for ( i = 0; i < 6; ++i ) {
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( 1 ).toString().trimmed(), values[ i ] );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT * FROM %1 order by id").arg(qtest_prepare)));
+ for (i = 0; i < 6; ++i) {
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value(1).toString().trimmed(), values[i]);
}
- QVERIFY( q.next() );
+ QVERIFY(q.next());
- QCOMPARE( q.value( 0 ).toInt(), 6 );
- QVERIFY( q.value( 1 ).toString().isEmpty() );
+ QCOMPARE(q.value(0).toInt(), 6);
+ QVERIFY(q.value(1).toString().isEmpty());
- if ( useUnicode ) {
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 7 );
- QCOMPARE( q.value( 1 ).toString(), utf8str );
+ if (useUnicode) {
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 7);
+ QCOMPARE(q.value(1).toString(), utf8str);
}
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name) values (?, 'Bart')" ) );
-
- q.bindValue( 0, 99 );
- QVERIFY_SQL( q, exec() );
- q.addBindValue( 100 );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.exec( "select * from " + qtest_prepare + " where id > 98 order by id" ) );
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name) values (?, 'Bart')")
+ .arg(qtest_prepare)));
+ q.bindValue(0, 99);
+ QVERIFY_SQL(q, exec());
+ q.addBindValue(100);
+ QVERIFY_SQL(q, exec());
- for ( i = 99; i <= 100; ++i ) {
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), i );
- QCOMPARE( q.value( 1 ).toString().trimmed(), QString( "Bart" ) );
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 98 order by id")
+ .arg(qtest_prepare)));
+ for (i = 99; i <= 100; ++i) {
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), i);
+ QCOMPARE(q.value(1).toString().trimmed(), u"Bart");
}
- /* insert a duplicate id and make sure the db bails out */
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name) values (?, ?)" ) );
-
+ // Insert a duplicate id and make sure the db bails out:
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name) values (?, ?)")
+ .arg(qtest_prepare)));
q.addBindValue( 99 );
+ q.addBindValue(u"something silly"_s);
- q.addBindValue( "something silly" );
-
- QVERIFY( !q.exec() );
-
- QVERIFY( q.lastError().isValid() );
+ QVERIFY(!q.exec());
+ QVERIFY(q.lastError().isValid());
+ QVERIFY(!q.isActive());
- QVERIFY( !q.isActive() );
-
- QVERIFY( q.prepare( "insert into " + qtest_prepare + " (id, name, name2) values (:id, :name, :name)" ) );
- for ( i = 101; i < 103; ++i ) {
- q.bindValue( ":id", i );
- q.bindValue( ":name", "name" );
- QVERIFY( q.exec() );
+ QVERIFY(q.prepare(QLatin1String(
+ "insert into %1 (id, name, name2) values (:id, :name, :name)")
+ .arg(qtest_prepare)));
+ for (i = 101; i < 103; ++i) {
+ q.bindValue(":id", i);
+ q.bindValue(":name", "name");
+ QVERIFY(q.exec());
}
// Test for QTBUG-6420
- QVERIFY( q.exec( "select * from " + qtest_prepare + " where id > 100 order by id" ) );
- QVERIFY( q.next() );
- QCOMPARE( q.value(0).toInt(), 101 );
- QCOMPARE( q.value(1).toString(), QString("name") );
- QCOMPARE( q.value(2).toString(), QString("name") );
-
- // Test that duplicated named placeholders before the next unique one works correctly - QTBUG-65150
- QVERIFY(q.prepare("insert into " + qtest_prepare + " (id, name, name2) values (:id, :id, :name)"));
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 100 order by id")
+ .arg(qtest_prepare)));
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 101);
+ QCOMPARE(q.value(1).toString(), u"name");
+ QCOMPARE(q.value(2).toString(), u"name");
+
+ // Test that duplicated named placeholders before the next unique one
+ // works correctly - QTBUG-65150
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name, name2) values (:id, :id, :name)")
+ .arg(qtest_prepare)));
for (i = 104; i < 106; ++i) {
q.bindValue(":id", i);
q.bindValue(":name", "name");
QVERIFY(q.exec());
}
- QVERIFY(q.exec("select * from " + qtest_prepare + " where id > 103 order by id"));
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 103 order by id")
+ .arg(qtest_prepare)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toInt(), 104);
- QCOMPARE(q.value(1).toString(), QString("104"));
- QCOMPARE(q.value(2).toString(), QString("name"));
+ QCOMPARE(q.value(1).toString(), u"104");
+ QCOMPARE(q.value(2).toString(), u"name");
// Test that duplicated named placeholders in any order
- QVERIFY(q.prepare("insert into " + qtest_prepare + " (id, name, name2) values (:id, :name, :id)"));
+ QVERIFY(q.prepare(QLatin1String("insert into %1 (id, name, name2) values (:id, :name, :id)")
+ .arg(qtest_prepare)));
for (i = 107; i < 109; ++i) {
q.bindValue(":id", i);
q.bindValue(":name", "name");
QVERIFY(q.exec());
}
- QVERIFY(q.exec("select * from " + qtest_prepare + " where id > 106 order by id"));
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 106 order by id")
+ .arg(qtest_prepare)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toInt(), 107);
- QCOMPARE(q.value(1).toString(), QString("name"));
- QCOMPARE(q.value(2).toString(), QString("107"));
+ QCOMPARE(q.value(1).toString(), u"name");
+ QCOMPARE(q.value(2).toString(), u"107");
// Test just duplicated placeholders
- QVERIFY(q.prepare("insert into " + qtest_prepare + " (id, name, name2) values (110, :name, :name)"));
+ QVERIFY(q.prepare(QLatin1String(
+ "insert into %1 (id, name, name2) values (110, :name, :name)")
+ .arg(qtest_prepare)));
q.bindValue(":name", "name");
QVERIFY_SQL(q, exec());
- QVERIFY(q.exec("select * from " + qtest_prepare + " where id > 109 order by id"));
+ QVERIFY(q.exec(QLatin1String("select * from %1 where id > 109 order by id")
+ .arg(qtest_prepare)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toInt(), 110);
- QCOMPARE(q.value(1).toString(), QString("name"));
- QCOMPARE(q.value(2).toString(), QString("name"));
- } // end of SQLite scope
+ QCOMPARE(q.value(1).toString(), u"name");
+ QCOMPARE(q.value(2).toString(), u"name");
+ } // End of SQLite scope.
}
void tst_QSqlQuery::prepared_select()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlQuery q( db );
- QVERIFY_SQL( q, prepare( "select a.id, a.t_char, a.t_varchar from " + qtest + " a where a.id = ?" ) );
-
- q.bindValue( 0, 1 );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.at(), ( int )QSql::BeforeFirstRow );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
-
- q.bindValue( 0, 2 );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.at(), ( int )QSql::BeforeFirstRow );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 2 );
-
- q.bindValue( 0, 3 );
- QVERIFY_SQL( q, exec() );
- QCOMPARE( q.at(), ( int )QSql::BeforeFirstRow );
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 3 );
-
- QVERIFY_SQL( q, prepare( "select a.id, a.t_char, a.t_varchar from " + qtest + " a where a.id = ?" ) );
- QCOMPARE( q.at(), ( int )QSql::BeforeFirstRow );
- QVERIFY( !q.first() );
-}
-
-void tst_QSqlQuery::sqlServerLongStrings()
-{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType != QSqlDriver::MSSqlServer)
- QSKIP( "SQL Server specific test");
-
- QSqlQuery q( db );
-
- QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("qtest_longstr", __FILE__, db) + " (id int primary key, longstring ntext)"));
-
- QVERIFY_SQL(q, prepare("INSERT INTO " + qTableName("qtest_longstr", __FILE__, db) + " VALUES (?, ?)"));
-
- q.addBindValue( 0 );
-
- q.addBindValue( QString::fromLatin1( "bubu" ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ const QString query = QLatin1String(
+ "select a.id, a.t_char, a.t_varchar from %1 a where a.id = ?").arg(qtest);
- QVERIFY_SQL( q, exec() );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, prepare(query));
- QString testStr;
+ q.bindValue(0, 1);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
- testStr.fill( QLatin1Char( 'a' ), 85000 );
+ q.bindValue(0, 2);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 2);
- q.addBindValue( 1 );
+ q.bindValue(0, 3);
+ QVERIFY_SQL(q, exec());
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 3);
- q.addBindValue( testStr );
+ QVERIFY_SQL(q, prepare(query));
+ QCOMPARE(q.at(), QSql::BeforeFirstRow);
+ QVERIFY(!q.first());
+}
- QVERIFY_SQL( q, exec() );
+void tst_QSqlQuery::sqlServerLongStrings()
+{
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
+ QSKIP("Test is specific to SQL Server");
- QVERIFY_SQL(q, exec("select * from " + qTableName( "qtest_longstr", __FILE__, db)));
+ QSqlQuery q(db);
+ const QString tableName = qTableName("qtest_longstr", __FILE__, db);
- QVERIFY_SQL( q, next() );
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id int primary key, longstring ntext)")
+ .arg(tableName)));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 VALUES (?, ?)").arg(tableName)));
- QCOMPARE( q.value( 0 ).toInt(), 0 );
+ q.addBindValue(0);
+ q.addBindValue(u"bubu"_s);
+ QVERIFY_SQL(q, exec());
- QCOMPARE( q.value( 1 ).toString(), QString::fromLatin1( "bubu" ) );
+ const QString testStr(85000, QLatin1Char('a'));
- QVERIFY_SQL( q, next() );
+ q.addBindValue(1);
+ q.addBindValue(testStr);
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, exec("select * from " + tableName));
- QCOMPARE( q.value( 0 ).toInt(), 1 );
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 0);
+ QCOMPARE(q.value(1).toString(), u"bubu");
- QCOMPARE( q.value( 1 ).toString(), testStr );
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toString(), testStr);
}
void tst_QSqlQuery::invalidQuery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
- QVERIFY( !q.exec() );
+ QVERIFY(!q.exec());
- QVERIFY( !q.exec( "blahfasel" ) );
- QVERIFY( q.lastError().type() != QSqlError::NoError );
- QVERIFY( !q.next() );
- QVERIFY( !q.isActive() );
+ QVERIFY(!q.exec("blahfasel"));
+ QVERIFY(q.lastError().type() != QSqlError::NoError);
+ QVERIFY(!q.next());
+ QVERIFY(!q.isActive());
- if (dbType != QSqlDriver::Oracle && dbType != QSqlDriver::DB2 && !db.driverName().startsWith("QODBC")) {
- // oracle and db2 just prepares everything without complaining
- if ( db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
- QVERIFY( !q.prepare( "blahfasel" ) );
+ if (dbType != QSqlDriver::Oracle && dbType != QSqlDriver::DB2
+ && !db.driverName().startsWith("QODBC")) {
+ // Oracle and DB2 just prepare everything without complaining:
+ if (db.driver()->hasFeature(QSqlDriver::PreparedQueries))
+ QVERIFY(!q.prepare("blahfasel"));
}
- QVERIFY( !q.exec() );
-
- QVERIFY( !q.isActive() );
- QVERIFY( !q.next() );
+ QVERIFY(!q.exec());
+ QVERIFY(!q.isActive());
+ QVERIFY(!q.next());
}
void tst_QSqlQuery::batchExec()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tableName = qTableName("qtest_batch", __FILE__, db);
tst_Databases::safeDropTable(db, tableName);
const auto dbType = tst_Databases::getDatabaseType(db);
- QString timeStampString;
- if (dbType == QSqlDriver::Interbase)
- timeStampString = QLatin1String("TIMESTAMP");
- else
- timeStampString = QLatin1String("TIMESTAMP (3)");
+ QLatin1String timeStampString(dbType == QSqlDriver::Interbase ? "TIMESTAMP" : "TIMESTAMP (3)");
- QVERIFY_SQL(q, exec(QStringLiteral("create table ") + tableName +
- QStringLiteral(" (id int, name varchar(20), dt date, num numeric(8, 4), "
- "dtstamp ") + timeStampString +
- QStringLiteral(", extraId int, extraName varchar(20))")));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %2 (id int, name varchar(20), dt date, "
+ "num numeric(8, 4), dtstamp %1, extraId int, extraName varchar(20))")
+ .arg(timeStampString, tableName)));
const QVariantList intCol = { 1, 2, QVariant(QMetaType(QMetaType::Int)) };
- const QVariantList charCol = { QStringLiteral("harald"), QStringLiteral("boris"),
+ const QVariantList charCol = { u"harald"_s, u"boris"_s,
QVariant(QMetaType(QMetaType::QString)) };
const QDateTime currentDateTime = QDateTime(QDateTime::currentDateTime());
const QVariantList dateCol = { currentDateTime.date(), currentDateTime.date().addDays(-1),
@@ -2608,20 +2613,20 @@ void tst_QSqlQuery::batchExec()
QVariant(QMetaType(QMetaType::QDateTime)) };
// Test with positional placeholders
- QVERIFY_SQL(q, prepare(QStringLiteral("insert into ") + tableName +
- QStringLiteral(" (id, name, dt, num, dtstamp, extraId, extraName) values "
- "(?, ?, ?, ?, ?, ?, ?)")));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 "
+ "(id, name, dt, num, dtstamp, extraId, extraName) "
+ "values (?, ?, ?, ?, ?, ?, ?)").arg(tableName)));
q.addBindValue(intCol);
- q.addBindValue( charCol );
- q.addBindValue( dateCol );
- q.addBindValue( numCol );
+ q.addBindValue(charCol);
+ q.addBindValue(dateCol);
+ q.addBindValue(numCol);
q.addBindValue(timeStampCol);
q.addBindValue(intCol);
q.addBindValue(charCol);
- QVERIFY_SQL( q, execBatch() );
- QVERIFY_SQL(q, exec(QStringLiteral("select id, name, dt, num, dtstamp, "
- "extraId, extraName from ") + tableName));
+ QVERIFY_SQL(q, execBatch());
+ QVERIFY_SQL(q, exec(QLatin1String("select id, name, dt, num, dtstamp, extraId, extraName from ")
+ + tableName));
for (int i = 0; i < intCol.size(); ++i) {
QVERIFY(q.next());
@@ -2629,9 +2634,10 @@ void tst_QSqlQuery::batchExec()
QCOMPARE(q.value(1).toString(), charCol.at(i));
QCOMPARE(q.value(2).toDate(), dateCol.at(i));
QCOMPARE(q.value(3).toDouble(), numCol.at(i));
- if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer && timeStampCol.at(i).isNull()) {
- QEXPECT_FAIL("", "This appears to be a bug in MySQL as it converts null datetimes to the "
- "current datetime for a timestamp field", Continue);
+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer
+ && timeStampCol.at(i).isNull()) {
+ QEXPECT_FAIL("", "This appears to be a bug in MySQL as it converts null datetimes to "
+ "the current datetime for a timestamp field", Continue);
}
QCOMPARE(q.value(4).toDateTime(), timeStampCol.at(i));
QCOMPARE(q.value(5).toInt(), intCol.at(i));
@@ -2639,10 +2645,11 @@ void tst_QSqlQuery::batchExec()
}
// Empty table ready for retesting with duplicated named placeholders
- QVERIFY_SQL(q, exec(QStringLiteral("delete from ") + tableName));
- QVERIFY_SQL(q, prepare(QStringLiteral("insert into ") + tableName +
- QStringLiteral(" (id, name, dt, num, dtstamp, extraId, extraName) "
- "values (:id, :name, :dt, :num, :dtstamp, :id, :name)")));
+ QVERIFY_SQL(q, exec(QLatin1String("delete from ") + tableName));
+ QVERIFY_SQL(q, prepare(QLatin1String(
+ "insert into %1 (id, name, dt, num, dtstamp, extraId, extraName) "
+ "values (:id, :name, :dt, :num, :dtstamp, :id, :name)")
+ .arg(tableName)));
q.bindValue(":id", intCol);
q.bindValue(":name", charCol);
q.bindValue(":dt", dateCol);
@@ -2650,8 +2657,8 @@ void tst_QSqlQuery::batchExec()
q.bindValue(":dtstamp", timeStampCol);
QVERIFY_SQL(q, execBatch());
- QVERIFY_SQL(q, exec(QStringLiteral("select id, name, dt, num, dtstamp, extraId, extraName from ") +
- tableName));
+ QVERIFY_SQL(q, exec(QLatin1String("select id, name, dt, num, dtstamp, extraId, extraName from ")
+ + tableName));
for (int i = 0; i < intCol.size(); ++i) {
QVERIFY(q.next());
@@ -2659,9 +2666,10 @@ void tst_QSqlQuery::batchExec()
QCOMPARE(q.value(1).toString(), charCol.at(i));
QCOMPARE(q.value(2).toDate(), dateCol.at(i));
QCOMPARE(q.value(3).toDouble(), numCol.at(i));
- if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer && timeStampCol.at(i).isNull()) {
- QEXPECT_FAIL("", "This appears to be a bug in MySQL as it converts null datetimes to the "
- "current datetime for a timestamp field", Continue);
+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer
+ && timeStampCol.at(i).isNull()) {
+ QEXPECT_FAIL("", "This appears to be a bug in MySQL as it converts null datetimes to "
+ "the current datetime for a timestamp field", Continue);
}
QCOMPARE(q.value(4).toDateTime(), timeStampCol.at(i));
QCOMPARE(q.value(5).toInt(), intCol.at(i));
@@ -2672,16 +2680,17 @@ void tst_QSqlQuery::batchExec()
// for batch operations as this will not work without it
if (db.driver()->hasFeature(QSqlDriver::BatchOperations)) {
const QString procName = qTableName("qtest_batch_proc", __FILE__, db);
- QVERIFY_SQL(q, exec("create or replace procedure " + procName +
- " (x in timestamp, y out timestamp) is\n"
- "begin\n"
- " y := x;\n"
- "end;\n"));
- QVERIFY(q.prepare("call " + procName + "(?, ?)"));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create or replace procedure %1 (x in timestamp, y out timestamp) "
+ "is\n"
+ "begin\n"
+ " y := x;\n"
+ "end;\n").arg(procName)));
+ QVERIFY(q.prepare(QLatin1String("call %1(?, ?)").arg(procName)));
q.addBindValue(timeStampCol, QSql::In);
QVariantList emptyDateTimes;
emptyDateTimes.reserve(timeStampCol.size());
- for (int i = 0; i < timeStampCol.size(); i++)
+ for (int i = 0; i < timeStampCol.size(); ++i)
emptyDateTimes << QVariant(QDateTime());
q.addBindValue(emptyDateTimes, QSql::Out);
QVERIFY_SQL(q, execBatch());
@@ -2698,16 +2707,15 @@ void tst_QSqlQuery::QTBUG_43874()
QSqlQuery q(db);
const QString tableName = qTableName("bug43874", __FILE__, db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INT)"));
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (id) VALUES (?)"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id INT)").arg(tableName)));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 (id) VALUES (?)").arg(tableName)));
for (int i = 0; i < 2; ++i) {
- QVariantList ids;
- ids << i;
+ const QVariantList ids = { i };
q.addBindValue(ids);
QVERIFY_SQL(q, execBatch());
}
- QVERIFY_SQL(q, exec("SELECT id FROM " + tableName + " ORDER BY id"));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT id FROM %1 ORDER BY id").arg(tableName)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toInt(), 0);
@@ -2718,166 +2726,161 @@ void tst_QSqlQuery::QTBUG_43874()
void tst_QSqlQuery::oraArrayBind()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- if ( !db.driver()->hasFeature( QSqlDriver::BatchOperations ) )
- QSKIP( "Database can't do BatchOperations");
-
- QSqlQuery q( db );
-
- QVERIFY_SQL( q, exec( "CREATE OR REPLACE PACKAGE ora_array_test "
- "IS "
- "TYPE names_type IS TABLE OF VARCHAR(64) NOT NULL INDEX BY BINARY_INTEGER; "
- "names_tab names_type; "
- "PROCEDURE set_name(name_in IN VARCHAR2, row_in in INTEGER); "
- "PROCEDURE get_name(row_in IN INTEGER, str_out OUT VARCHAR2); "
- "PROCEDURE get_table(tbl OUT names_type); "
- "PROCEDURE set_table(tbl IN names_type); "
- "END ora_array_test; " ) );
-
- QVERIFY_SQL( q, exec( "CREATE OR REPLACE PACKAGE BODY ora_array_test "
- "IS "
- "PROCEDURE set_name(name_in IN VARCHAR2, row_in in INTEGER) "
- "IS "
- "BEGIN "
- "names_tab(row_in) := name_in; "
- "END set_name; "
-
- "PROCEDURE get_name(row_in IN INTEGER, str_out OUT VARCHAR2) "
- "IS "
- "BEGIN "
- "str_out := names_tab(row_in); "
- "END get_name; "
-
- "PROCEDURE get_table(tbl OUT names_type) "
- "IS "
- "BEGIN "
- "tbl:=names_tab; "
- "END get_table; "
-
- "PROCEDURE set_table(tbl IN names_type) "
- "IS "
- "BEGIN "
- "names_tab := tbl; "
- "END set_table; "
- "END ora_array_test; " ) );
-
- QVariantList list;
-
- list << QString( "lorem" ) << QString( "ipsum" ) << QString( "dolor" ) << QString( "sit" ) << QString( "amet" );
-
- QVERIFY_SQL( q, prepare( "BEGIN "
- "ora_array_test.set_table(?); "
- "END;" ) );
-
- q.bindValue( 0, list, QSql::In );
-
- QVERIFY_SQL( q, execBatch( QSqlQuery::ValuesAsColumns ) );
-
- QVERIFY_SQL( q, prepare( "BEGIN "
- "ora_array_test.get_table(?); "
- "END;" ) );
-
- list.clear();
-
- list << QString( 64,' ' ) << QString( 64,' ' ) << QString( 64,' ' ) << QString( 64,' ' ) << QString( 64,' ' );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- q.bindValue( 0, list, QSql::Out );
+ if (!db.driver()->hasFeature(QSqlDriver::BatchOperations))
+ QSKIP("Database can't do BatchOperations");
- QVERIFY_SQL( q, execBatch( QSqlQuery::ValuesAsColumns ) );
+ QSqlQuery q(db);
- QVariantList out_list = q.boundValue( 0 ).toList();
+ QVERIFY_SQL(q, exec("CREATE OR REPLACE PACKAGE ora_array_test "
+ "IS TYPE names_type IS "
+ "TABLE OF VARCHAR(64) NOT NULL INDEX BY BINARY_INTEGER; "
+ "names_tab names_type; "
+ "PROCEDURE set_name(name_in IN VARCHAR2, row_in in INTEGER); "
+ "PROCEDURE get_name(row_in IN INTEGER, str_out OUT VARCHAR2); "
+ "PROCEDURE get_table(tbl OUT names_type); "
+ "PROCEDURE set_table(tbl IN names_type); "
+ "END ora_array_test; "));
+
+ QVERIFY_SQL(q, exec("CREATE OR REPLACE PACKAGE BODY ora_array_test "
+ "IS "
+ "PROCEDURE set_name(name_in IN VARCHAR2, row_in in INTEGER) "
+ "IS "
+ "BEGIN "
+ "names_tab(row_in) := name_in; "
+ "END set_name; "
+
+ "PROCEDURE get_name(row_in IN INTEGER, str_out OUT VARCHAR2) "
+ "IS "
+ "BEGIN "
+ "str_out := names_tab(row_in); "
+ "END get_name; "
+
+ "PROCEDURE get_table(tbl OUT names_type) "
+ "IS "
+ "BEGIN "
+ "tbl:=names_tab; "
+ "END get_table; "
+
+ "PROCEDURE set_table(tbl IN names_type) "
+ "IS "
+ "BEGIN "
+ "names_tab := tbl; "
+ "END set_table; "
+ "END ora_array_test; "));
+
+ QVariantList list = { u"lorem"_s, u"ipsum"_s, u"dolor"_s, u"sit"_s, u"amet"_s };
+
+ QVERIFY_SQL(q, prepare("BEGIN "
+ "ora_array_test.set_table(?); "
+ "END;"));
+ q.bindValue(0, list, QSql::In);
+ QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns));
+ QVERIFY_SQL(q, prepare("BEGIN "
+ "ora_array_test.get_table(?); "
+ "END;"));
- QCOMPARE( out_list.at( 0 ).toString(), QString( "lorem" ) );
+ list.clear();
+ list.resize(5, QString(64, ' '));
- QCOMPARE( out_list.at( 1 ).toString(), QString( "ipsum" ) );
+ q.bindValue(0, list, QSql::Out);
- QCOMPARE( out_list.at( 2 ).toString(), QString( "dolor" ) );
+ QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns));
- QCOMPARE( out_list.at( 3 ).toString(), QString( "sit" ) );
+ const QVariantList out_list = q.boundValue(0).toList();
- QCOMPARE( out_list.at( 4 ).toString(), QString( "amet" ) );
+ QCOMPARE(out_list.at(0).toString(), u"lorem");
+ QCOMPARE(out_list.at(1).toString(), u"ipsum");
+ QCOMPARE(out_list.at(2).toString(), u"dolor");
+ QCOMPARE(out_list.at(3).toString(), u"sit");
+ QCOMPARE(out_list.at(4).toString(), u"amet");
- QVERIFY_SQL( q, exec( "DROP PACKAGE ora_array_test" ) );
+ QVERIFY_SQL(q, exec("DROP PACKAGE ora_array_test"));
}
-/*
- Tests that QSqlDatabase::record and QSqlQuery::record returns the same thing
- otherwise our models get confused.
- */
+/* Tests that QSqlDatabase::record() and QSqlQuery::record() return the same
+ thing - otherwise our models get confused.
+*/
void tst_QSqlQuery::record_sqlite()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
+ const QString tableName = qTableName("record_sqlite", __FILE__, db);
- QVERIFY_SQL(q, exec("create table " + qTableName("record_sqlite", __FILE__, db) + "(id integer primary key, name varchar, title int)"));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %1(id integer primary key, name varchar, title int)")
+ .arg(tableName)));
- QSqlRecord rec = db.record(qTableName("record_sqlite", __FILE__, db));
+ QSqlRecord rec = db.record(tableName);
- QCOMPARE( rec.count(), 3 );
- QCOMPARE( rec.field( 0 ).metaType().id(), QMetaType::Int );
- QCOMPARE( rec.field( 1 ).metaType().id(), QMetaType::QString );
- QCOMPARE( rec.field( 2 ).metaType().id(), QMetaType::Int );
+ QCOMPARE(rec.count(), 3);
+ QCOMPARE(rec.field(0).metaType().id(), QMetaType::Int);
+ QCOMPARE(rec.field(1).metaType().id(), QMetaType::QString);
+ QCOMPARE(rec.field(2).metaType().id(), QMetaType::Int);
- /* important - select from an empty table */
- QVERIFY_SQL(q, exec("select id, name, title from " + qTableName("record_sqlite", __FILE__, db)));
+ // Important - select from an empty table:
+ QVERIFY_SQL(q, exec("select id, name, title from " + tableName));
rec = q.record();
- QCOMPARE( rec.count(), 3 );
- QCOMPARE( rec.field( 0 ).metaType().id(), QMetaType::Int );
- QCOMPARE( rec.field( 1 ).metaType().id(), QMetaType::QString );
- QCOMPARE( rec.field( 2 ).metaType().id(), QMetaType::Int );
+ QCOMPARE(rec.count(), 3);
+ QCOMPARE(rec.field(0).metaType().id(), QMetaType::Int);
+ QCOMPARE(rec.field(1).metaType().id(), QMetaType::QString);
+ QCOMPARE(rec.field(2).metaType().id(), QMetaType::Int);
}
void tst_QSqlQuery::oraLong()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
- QString aLotOfText( 127000, QLatin1Char( 'H' ) );
+ QString aLotOfText(127000, QLatin1Char('H'));
+ const QString tableName = qTableName("qtest_longstr", __FILE__, db);
- QVERIFY_SQL(q, exec("create table " + qTableName("qtest_longstr", __FILE__, db) + " (id int primary key, astr long)"));
- QVERIFY_SQL(q, prepare("insert into " + qTableName("qtest_longstr", __FILE__, db) + " (id, astr) values (?, ?)"));
- q.addBindValue( 1 );
- q.addBindValue( aLotOfText );
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int primary key, astr long)")
+ .arg(tableName)));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 (id, astr) values (?, ?)")
+ .arg(tableName)));
+ q.addBindValue(1);
+ q.addBindValue(aLotOfText);
+ QVERIFY_SQL(q, exec());
- QVERIFY_SQL(q, exec("select id,astr from " + qTableName("qtest_longstr", __FILE__, db)));
+ QVERIFY_SQL(q, exec("select id,astr from " + tableName));
- QVERIFY( q.next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toString(), aLotOfText );
+ QVERIFY(q.next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toString(), aLotOfText);
}
void tst_QSqlQuery::execErrorRecovery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tbl = qTableName("qtest_exerr", __FILE__, db);
q.exec("drop table " + tbl);
- QVERIFY_SQL(q, exec("create table " + tbl + " (id int not null primary key)"));
- QVERIFY_SQL(q, prepare("insert into " + tbl + " values (?)" ));
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id int not null primary key)").arg(tbl)));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1 values (?)").arg(tbl)));
- q.addBindValue( 1 );
- QVERIFY_SQL( q, exec() );
+ q.addBindValue(1);
+ QVERIFY_SQL(q, exec());
- q.addBindValue( 1 ); // binding the same pkey - should fail
- QVERIFY( !q.exec() );
+ q.addBindValue(1); // Binding the same pkey - should fail.
+ QVERIFY(!q.exec());
- q.addBindValue( 2 ); // this should work again
- QVERIFY_SQL( q, exec() );
+ q.addBindValue(2); // This should work again.
+ QVERIFY_SQL(q, exec());
}
void tst_QSqlQuery::prematureExec()
@@ -2892,6 +2895,8 @@ void tst_QSqlQuery::prematureExec()
if (cut >= 0)
dbName = dbName.sliced(cut + 1);
+ const auto tidier = qScopeGuard([dbName]() { QSqlDatabase::removeDatabase(dbName); });
+ // Note: destruction of db needs to happen before we call removeDatabase.
auto db = QSqlDatabase::addDatabase(dbName);
QSqlQuery q(db);
@@ -2911,46 +2916,43 @@ void tst_QSqlQuery::prematureExec()
void tst_QSqlQuery::lastInsertId()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- if ( !db.driver()->hasFeature( QSqlDriver::LastInsertId ) )
- QSKIP( "Database doesn't support lastInsertId");
+ if (!db.driver()->hasFeature(QSqlDriver::LastInsertId))
+ QSKIP("Database doesn't support lastInsertId");
- QSqlQuery q( db );
+ QSqlQuery q(db);
// PostgreSQL >= 8.1 relies on lastval() which does not work if a value is
// manually inserted to the serial field, so we create a table specifically
if (tst_Databases::getDatabaseType(db) == QSqlDriver::PostgreSQL) {
const auto tst_lastInsertId = qTableName("tst_lastInsertId", __FILE__, db);
tst_Databases::safeDropTable(db, tst_lastInsertId);
- QVERIFY_SQL(q, exec(QStringLiteral("create table ") + tst_lastInsertId +
- QStringLiteral(" (id serial not null, t_varchar "
- "varchar(20), t_char char(20), primary key(id))")));
- QVERIFY_SQL(q, exec(QStringLiteral("insert into ") + tst_lastInsertId +
- QStringLiteral(" (t_varchar, t_char) values "
- "('VarChar41', 'Char41')")));
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id serial not null, t_varchar "
+ "varchar(20), t_char char(20), primary key(id))")
+ .arg(tst_lastInsertId)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 (t_varchar, t_char) values "
+ "('VarChar41', 'Char41')").arg(tst_lastInsertId)));
} else {
- QVERIFY_SQL(q, exec(QStringLiteral("insert into ") + qtest +
- QStringLiteral(" values (41, 'VarChar41', 'Char41')")));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (41, 'VarChar41', 'Char41')")
+ .arg(qtest)));
}
- QVariant v = q.lastInsertId();
-
- QVERIFY( v.isValid() );
+ QVERIFY(q.lastInsertId().isValid());
}
void tst_QSqlQuery::lastQuery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
QString sql = "select * from " + qtest;
- QVERIFY_SQL( q, exec( sql ) );
- QCOMPARE( q.lastQuery(), sql );
- QCOMPARE( q.executedQuery(), sql );
+ QVERIFY_SQL(q, exec(sql));
+ QCOMPARE(q.lastQuery(), sql);
+ QCOMPARE(q.executedQuery(), sql);
}
void tst_QSqlQuery::lastQueryTwoQueries()
@@ -2974,30 +2976,34 @@ void tst_QSqlQuery::lastQueryTwoQueries()
void tst_QSqlQuery::psql_bindWithDoubleColonCastOperator()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString tablename(qTableName("bindtest", __FILE__, db));
- QSqlQuery q( db );
-
- QVERIFY_SQL( q, exec( "create table " + tablename + " (id1 int, id2 int, id3 int, fld1 int, fld2 int)" ) );
- QVERIFY_SQL( q, exec( "insert into " + tablename + " values (1, 2, 3, 10, 5)" ) );
-
- QVERIFY_SQL( q, prepare( "select sum((fld1 - fld2)::int) from " + tablename + " where id1 = :myid1 and id2 =:myid2 and id3=:myid3" ) );
- q.bindValue( ":myid1", 1 );
- q.bindValue( ":myid2", 2 );
- q.bindValue( ":myid3", 3 );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %1 (id1 int, id2 int, id3 int, fld1 int, fld2 int)")
+ .arg(tablename)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 values (1, 2, 3, 10, 5)").arg(tablename)));
+
+ // Insert tableName last to let the other %-tokens' numbering match what they're replaced with:
+ const auto queryTemplate = QLatin1String("select sum((fld1 - fld2)::int) from %4 where "
+ "id1 = %1 and id2 =%2 and id3=%3");
+ const QString query = queryTemplate.arg(":myid1", ":myid2", ":myid3", tablename);
+ QVERIFY_SQL(q, prepare(query));
+ q.bindValue(":myid1", 1);
+ q.bindValue(":myid2", 2);
+ q.bindValue(":myid3", 3);
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
- // the positional placeholders are converted to named placeholders in executedQuery()
- if (db.driver()->hasFeature(QSqlDriver::PreparedQueries))
- QCOMPARE(q.executedQuery(), QString("select sum((fld1 - fld2)::int) from " + tablename + " where id1 = :myid1 and id2 =:myid2 and id3=:myid3"));
- else
- QCOMPARE(q.executedQuery(), QString("select sum((fld1 - fld2)::int) from " + tablename + " where id1 = 1 and id2 =2 and id3=3"));
+ // The positional placeholders are converted to named placeholders in executedQuery()
+ const QString expected = db.driver()->hasFeature(QSqlDriver::PreparedQueries)
+ ? query : queryTemplate.arg("1", "2", "3", tablename);
+ QCOMPARE(q.executedQuery(), expected);
}
void tst_QSqlQuery::psql_specialFloatValues()
@@ -3007,29 +3013,30 @@ void tst_QSqlQuery::psql_specialFloatValues()
if (!std::numeric_limits<float>::has_infinity)
QSKIP("Platform does not have infinity");
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
- CHECK_DATABASE( db );
+ CHECK_DATABASE(db);
QSqlQuery query(db);
const QString tableName = qTableName("floattest", __FILE__, db);
- QVERIFY_SQL( query, exec("create table " + tableName + " (value float)" ) );
- QVERIFY_SQL(query, prepare("insert into " + tableName + " values(:value)") );
-
- QVariantList data;
- data << QVariant(double(42.42))
- << QVariant(std::numeric_limits<double>::quiet_NaN())
- << QVariant(std::numeric_limits<double>::infinity())
- << QVariant(float(42.42))
- << QVariant(std::numeric_limits<float>::quiet_NaN())
- << QVariant(std::numeric_limits<float>::infinity());
-
- foreach (const QVariant &v, data) {
+ QVERIFY_SQL(query, exec(QLatin1String("create table %1 (value float)").arg(tableName)));
+ QVERIFY_SQL(query, prepare(QLatin1String("insert into %1 values(:value)").arg(tableName)));
+
+ const QVariant data[] = {
+ QVariant(double(42.42)),
+ QVariant(std::numeric_limits<double>::quiet_NaN()),
+ QVariant(std::numeric_limits<double>::infinity()),
+ QVariant(float(42.42)),
+ QVariant(std::numeric_limits<float>::quiet_NaN()),
+ QVariant(std::numeric_limits<float>::infinity()),
+ };
+
+ for (const QVariant &v : data) {
query.bindValue(":value", v);
- QVERIFY_SQL( query, exec() );
+ QVERIFY_SQL(query, exec());
}
- QVERIFY_SQL( query, exec("drop table " + tableName) );
+ QVERIFY_SQL(query, exec("drop table " + tableName));
}
/* For task 157397: Using QSqlQuery with an invalid QSqlDatabase
@@ -3039,25 +3046,28 @@ void tst_QSqlQuery::psql_specialFloatValues()
void tst_QSqlQuery::queryOnInvalidDatabase()
{
{
- QTest::ignoreMessage( QtWarningMsg, "QSqlDatabase: INVALID driver not loaded" );
- QSqlDatabase db = QSqlDatabase::addDatabase( "INVALID", "invalidConnection" );
- QVERIFY2( db.lastError().isValid(),
- qPrintable( QString( "db.lastError().isValid() should be true!" ) ) );
-
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::exec: database not open" );
- QSqlQuery query( "SELECT 1 AS ID", db );
- QVERIFY2( query.lastError().isValid(),
- qPrintable( QString( "query.lastError().isValid() should be true!" ) ) );
- }
+ const auto tidier = qScopeGuard([]() {
+ QSqlDatabase::removeDatabase("invalidConnection");
+ });
+ // Note: destruction of db needs to happen before we call removeDatabase.
+ QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: INVALID driver not loaded");
+#if QT_CONFIG(regularexpression)
+ QTest::ignoreMessage(QtWarningMsg,
+ QRegularExpression("QSqlDatabase: available drivers: "));
+#endif
+ QSqlDatabase db = QSqlDatabase::addDatabase("INVALID", "invalidConnection");
+ QVERIFY(db.lastError().isValid());
- QSqlDatabase::removeDatabase( "invalidConnection" );
+ QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::exec: database not open");
+ QSqlQuery query("SELECT 1 AS ID", db);
+ QVERIFY(query.lastError().isValid());
+ }
{
- QSqlDatabase db = QSqlDatabase::database( "this connection does not exist" );
- QTest::ignoreMessage( QtWarningMsg, "QSqlQuery::exec: database not open" );
- QSqlQuery query( "SELECT 1 AS ID", db );
- QVERIFY2( query.lastError().isValid(),
- qPrintable( QString( "query.lastError().isValid() should be true!" ) ) );
+ QSqlDatabase db = QSqlDatabase::database("this connection does not exist");
+ QTest::ignoreMessage(QtWarningMsg, "QSqlQuery::exec: database not open");
+ QSqlQuery query("SELECT 1 AS ID", db);
+ QVERIFY(query.lastError().isValid());
}
}
@@ -3067,299 +3077,313 @@ void tst_QSqlQuery::queryOnInvalidDatabase()
*/
void tst_QSqlQuery::createQueryOnClosedDatabase()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
// Only supported by these drivers
if (dbType != QSqlDriver::PostgreSQL && dbType != QSqlDriver::Oracle
- && dbType != QSqlDriver::MySqlServer && dbType != QSqlDriver::DB2)
- QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2");
+ && dbType != QSqlDriver::MySqlServer && dbType != QSqlDriver::DB2) {
+ QSKIP("Test is specific for PostgreSQL, Oracle, MySql and DB2");
+ }
db.close();
- QSqlQuery q( db );
+ QSqlQuery q(db);
db.open();
- QVERIFY_SQL( q, exec( QString( "select * from %1 where id = 1" ).arg( qtest ) ) );
+ QVERIFY_SQL(q, exec(QLatin1String("select * from %1 where id = 1").arg(qtest)));
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toString().trimmed(), QLatin1String( "VarChar1" ) );
- QCOMPARE( q.value( 2 ).toString().trimmed(), QLatin1String( "Char1" ) );
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toString().trimmed(), u"VarChar1");
+ QCOMPARE(q.value(2).toString().trimmed(), u"Char1");
db.close();
- QVERIFY2( !q.exec( QString( "select * from %1 where id = 1" ).arg( qtest ) ),
- qPrintable( QString( "This can't happen! The query should not have been executed!" ) ) );
+ QVERIFY2(!q.exec(QLatin1String("select * from %1 where id = 1").arg(qtest)),
+ "This can't happen! The query should not have been executed!");
}
void tst_QSqlQuery::reExecutePreparedForwardOnlyQuery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
- q.setForwardOnly( true );
+ QSqlQuery q(db);
+ q.setForwardOnly(true);
- QVERIFY_SQL( q, prepare( QString( "SELECT id, t_varchar, t_char FROM %1 WHERE id = :id" ).arg( qtest ) ) );
- q.bindValue( ":id", 1 );
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, prepare(QLatin1String("SELECT id, t_varchar, t_char FROM %1 WHERE id = :id")
+ .arg(qtest)));
+ q.bindValue(":id", 1);
+ QVERIFY_SQL(q, exec());
// Do something, like iterate over the result, or skip to the end
- QVERIFY_SQL( q, last() );
+ QVERIFY_SQL(q, last());
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
/* This was broken with SQLite because the cache size was set to 0 in the 2nd execute.
When forwardOnly is set we don't cahce the entire result, but we do cache the current row
but this requires the cache size to be equal to the column count.
*/
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.value( 1 ).toString().trimmed(), QString( "VarChar1" ) );
- QCOMPARE( q.value( 2 ).toString().trimmed(), QString( "Char1" ) );
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.value(1).toString().trimmed(), u"VarChar1");
+ QCOMPARE(q.value(2).toString().trimmed(), u"Char1");
}
void tst_QSqlQuery::finish()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
- QVERIFY_SQL( q, prepare( "SELECT id FROM " + qtest + " WHERE id = ?" ) );
+ QSqlQuery q(db);
+ QVERIFY_SQL(q, prepare(QLatin1String("SELECT id FROM %1 WHERE id = ?").arg(qtest)));
int id = 4;
- q.bindValue( 0, id );
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.isActive() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), id );
+ q.bindValue(0, id);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.isActive());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), id);
q.finish();
- QVERIFY( !q.isActive() ); // query is now inactive
- QCOMPARE( q.boundValue( 0 ).toInt(), id ); // bound values are retained
+ QVERIFY(!q.isActive()); // Query is now inactive, but ...
+ QCOMPARE(q.boundValue(0).toInt(), id); // bound values are retained.
- QVERIFY_SQL( q, exec() ); // no prepare necessary
- QVERIFY( q.isActive() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), id );
+ QVERIFY_SQL(q, exec()); // No prepare needed.
+ QVERIFY(q.isActive());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), id);
q.finish();
- QVERIFY( !q.isActive() );
+ QVERIFY(!q.isActive());
- QVERIFY_SQL( q, exec( "SELECT id FROM " + qtest + " WHERE id = 1" ) );
- QVERIFY( q.isActive() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 1 );
- QCOMPARE( q.record().count(), 1 );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT id FROM %1 WHERE id = 1").arg(qtest)));
+ QVERIFY(q.isActive());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1);
+ QCOMPARE(q.record().count(), 1);
}
void tst_QSqlQuery::sqlite_finish()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- if ( db.databaseName().startsWith( ':' ) )
- QSKIP( "This test requires a database on the filesystem, not in-memory");
+ if (db.databaseName().startsWith(':'))
+ QSKIP("This test requires a database on the filesystem, not in-memory");
{
- QSqlDatabase db2 = QSqlDatabase::addDatabase( "QSQLITE", "sqlite_finish_sqlite" );
- db2.setDatabaseName( db.databaseName() );
- QVERIFY_SQL( db2, open() );
+ const auto tidier = qScopeGuard([]() {
+ QSqlDatabase::removeDatabase("sqlite_finish_sqlite");
+ });
+ // Note: destruction of db2 needs to happen before we call removeDatabase.
+ QSqlDatabase db2 = QSqlDatabase::addDatabase("QSQLITE", "sqlite_finish_sqlite");
+ db2.setDatabaseName(db.databaseName());
+ QVERIFY_SQL(db2, open());
const QString tableName(qTableName("qtest_lockedtable", __FILE__, db));
- QSqlQuery q( db );
+ const auto wrapup = qScopeGuard([&]() { tst_Databases::safeDropTable(db, tableName); });
+ QSqlQuery q(db);
- tst_Databases::safeDropTable( db, tableName );
- q.exec( "CREATE TABLE " + tableName + " (pk_id INTEGER PRIMARY KEY, whatever TEXT)" );
- q.exec( "INSERT INTO " + tableName + " values(1, 'whatever')" );
- q.exec( "INSERT INTO " + tableName + " values(2, 'whatever more')" );
+ tst_Databases::safeDropTable(db, tableName);
+ q.exec(QLatin1String("CREATE TABLE %1 (pk_id INTEGER PRIMARY KEY, whatever TEXT)")
+ .arg(tableName));
+ q.exec(QLatin1String("INSERT INTO %1 values(1, 'whatever')").arg(tableName));
+ q.exec(QLatin1String("INSERT INTO %1 values(2, 'whatever more')").arg(tableName));
// This creates a read-lock in the database
- QVERIFY_SQL( q, exec( "SELECT * FROM " + tableName + " WHERE pk_id = 1 or pk_id = 2" ) );
- QVERIFY_SQL( q, next() );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT * FROM %1 WHERE pk_id = 1 or pk_id = 2")
+ .arg(tableName)));
+ QVERIFY_SQL(q, next());
// The DELETE will fail because of the read-lock
- QSqlQuery q2( db2 );
- QVERIFY( !q2.exec( "DELETE FROM " + tableName + " WHERE pk_id=2" ) );
- QCOMPARE( q2.numRowsAffected(), -1 );
+ QSqlQuery q2(db2);
+ QVERIFY(!q2.exec(QLatin1String("DELETE FROM %1 WHERE pk_id=2").arg(tableName)));
+ QCOMPARE(q2.numRowsAffected(), -1);
// The DELETE will succeed now because finish() removes the lock
q.finish();
- QVERIFY_SQL( q2, exec( "DELETE FROM " + tableName + " WHERE pk_id=2" ) );
- QCOMPARE( q2.numRowsAffected(), 1 );
-
- tst_Databases::safeDropTable( db, tableName );
+ QVERIFY_SQL(q2, exec(QLatin1String("DELETE FROM %1 WHERE pk_id=2").arg(tableName)));
+ QCOMPARE(q2.numRowsAffected(), 1);
}
-
- QSqlDatabase::removeDatabase( "sqlite_finish_sqlite" );
}
void tst_QSqlQuery::nextResult()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (!db.driver()->hasFeature(QSqlDriver::MultipleResultSets))
QSKIP("DBMS does not support multiple result sets");
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tableName(qTableName("more_results", __FILE__, db));
- QVERIFY_SQL( q, exec( "CREATE TABLE " + tableName + " (id integer, text varchar(20), num numeric(6, 3), empty varchar(10));" ) );
-
- QVERIFY_SQL( q, exec( "INSERT INTO " + tableName + " VALUES(1, 'one', 1.1, '');" ) );
-
- QVERIFY_SQL( q, exec( "INSERT INTO " + tableName + " VALUES(2, 'two', 2.2, '');" ) );
-
- QVERIFY_SQL( q, exec( "INSERT INTO " + tableName + " VALUES(3, 'three', 3.3, '');" ) );
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "CREATE TABLE %1 (id integer, text varchar(20), "
+ "num numeric(6, 3), empty varchar(10));").arg(tableName)));
- QVERIFY_SQL( q, exec( "INSERT INTO " + tableName + " VALUES(4, 'four', 4.4, '');" ) );
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(1, 'one', 1.1, '');").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(2, 'two', 2.2, '');").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(3, 'three', 3.3, '');")
+ .arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(4, 'four', 4.4, '');")
+ .arg(tableName)));
- QStringList tstStrings;
-
- tstStrings << "one" << "two" << "three" << "four";
+ const QString tstStrings[] = { u"one"_s, u"two"_s, u"three"_s, u"four"_s };
// Query that returns only one result set, nothing special about this
- QVERIFY_SQL( q, exec( QString( "SELECT * FROM %1;" ).arg( tableName ) ) );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT * FROM %1;").arg(tableName)));
- QVERIFY( q.next() ); // Move to first row of the result set
+ QVERIFY(q.next()); // Move to first row of the result set
- QVERIFY( !q.nextResult() ); // No more result sets are available
+ QVERIFY(!q.nextResult()); // No more result sets are available
- QVERIFY( !q.isActive() ); // So the query is no longer active
+ QVERIFY(!q.isActive()); // So the query is no longer active
- QVERIFY( !q.next() ); // ... and no data is available as the call
+ QVERIFY(!q.next()); // ... and no data is available as the call
- // to nextResult() discarded the result set
+ // Attempting nextResult() discarded the result set.
// Query that returns two result sets (batch sql)
// When working with multiple result sets SQL Server insists on non-scrollable cursors
if (db.driverName().startsWith("QODBC"))
- q.setForwardOnly( true );
-
- QVERIFY_SQL( q, exec( "SELECT id FROM " + tableName + "; SELECT text, num FROM " + tableName + ';' ) );
-
- QCOMPARE( q.record().count(), 1 ); // Check that the meta data is as expected
-
- QCOMPARE( q.record().field( 0 ).name().toUpper(), QString( "ID" ) );
+ q.setForwardOnly(true);
- QCOMPARE( q.record().field( 0 ).metaType().id(), QMetaType::Int );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT id FROM %1; SELECT text, num FROM %1;")
+ .arg(tableName)));
- QVERIFY( q.nextResult() ); // Discards first result set and move to the next
-
- QCOMPARE( q.record().count(), 2 ); // New meta data should be available
+ QCOMPARE(q.record().count(), 1); // Check that the meta data is as expected
+ QCOMPARE(q.record().field(0).name().toUpper(), u"ID");
+ QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Int);
- QCOMPARE( q.record().field( 0 ).name().toUpper(), QString( "TEXT" ) );
+ QVERIFY(q.nextResult()); // Discards first result set and move to the next
+ QCOMPARE(q.record().count(), 2); // New meta data should be available
- QCOMPARE( q.record().field( 0 ).metaType().id(), QMetaType::QString );
+ QCOMPARE(q.record().field(0).name().toUpper(), u"TEXT");
+ QCOMPARE(q.record().field(0).metaType().id(), QMetaType::QString);
- QCOMPARE( q.record().field( 1 ).name().toUpper(), QString( "NUM" ) );
+ QCOMPARE(q.record().field(1).name().toUpper(), u"NUM");
QCOMPARE(q.record().field(1).metaType().id(), QMetaType::Double);
- QVERIFY( q.next() ); // Move to first row of the second result set
-
+ QVERIFY(q.next()); // Move to first row of the second result set
QFAIL_SQL(q, nextResult()); // No more result sets after this
-
- QVERIFY( !q.isActive() ); // So the query is no longer active
-
- QVERIFY( !q.next() ); // ... and no data is available as the call to
+ QVERIFY(!q.isActive()); // So the query is no longer active
+ QVERIFY(!q.next()); // ... and no data is available as the call to
// nextResult() discarded the result set
// Query that returns one result set, a count of affected rows and then another result set
- QString query1 = QString( "SELECT id, text, num, empty FROM %1 WHERE id <= 3" ).arg( tableName );
-
- QString query2 = QString( "UPDATE %1 SET empty = 'Yatta!'" ).arg( tableName );
-
- QString query3 = QString( "SELECT id, empty FROM %1 WHERE id <=2" ).arg( tableName );
-
- QVERIFY_SQL( q, exec( QString( "%1; %2; %3;" ).arg( query1 ).arg( query2 ).arg( query3 ) ) );
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT id, text, num, empty FROM %1 WHERE id <= 3; "
+ "UPDATE %1 SET empty = 'Yatta!'; "
+ "SELECT id, empty FROM %1 WHERE id <=2;").arg(tableName)));
// Check result set returned by first statement
- QVERIFY( q.isSelect() ); // The first statement is a select
-
- for ( int i = 0; i < 3; i++ ) {
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 1+i );
- QCOMPARE( q.value( 1 ).toString(), tstStrings.at( i ) );
- QCOMPARE( q.value( 2 ).toDouble(), 1.1*( i+1 ) );
- QVERIFY( q.value( 3 ).toString().isEmpty() );
+ QVERIFY(q.isSelect()); // The first statement is a select
+
+ for (int i = 0; i < 3; ++i) {
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1 + i);
+ QCOMPARE(q.value(1).toString(), tstStrings[i]);
+ QCOMPARE(q.value(2).toDouble(), 1.1 * (i + 1));
+ QVERIFY(q.value(3).toString().isEmpty());
}
- QVERIFY_SQL( q, nextResult() );
+ QVERIFY_SQL(q, nextResult());
- QVERIFY( !q.isSelect() ); // The second statement isn't a SELECT
- QVERIFY( !q.next() ); // ... so no result set is available
- QCOMPARE( q.numRowsAffected(), 4 ); // 4 rows was affected by the UPDATE
+ QVERIFY(!q.isSelect()); // The second statement isn't a SELECT
+ QVERIFY(!q.next()); // ... so no result set is available
+ QCOMPARE(q.numRowsAffected(), 4); // 4 rows was affected by the UPDATE
// Check result set returned by third statement
- QVERIFY_SQL( q, nextResult() );
- QVERIFY( q.isSelect() ); // The third statement is a SELECT
+ QVERIFY_SQL(q, nextResult());
+ QVERIFY(q.isSelect()); // The third statement is a SELECT
- for ( int i = 0; i < 2; i++ ) {
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), 1+i );
- QCOMPARE( q.value( 1 ).toString(), QString( "Yatta!" ) );
+ for (int i = 0; i < 2; ++i) {
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), 1 + i);
+ QCOMPARE(q.value(1).toString(), u"Yatta!");
}
// Stored procedure with multiple result sets
const QString procName(qTableName("proc_more_res", __FILE__, db));
- if (dbType == QSqlDriver::PostgreSQL)
- q.exec(QString("DROP FUNCTION %1(refcursor, refcursor);").arg(procName));
- else
- q.exec(QString("DROP PROCEDURE %1;").arg(procName));
-
- if (dbType == QSqlDriver::MySqlServer)
- QVERIFY_SQL( q, exec( QString( "CREATE PROCEDURE %1()"
- "\nBEGIN"
- "\nSELECT id, text FROM %2;"
- "\nSELECT empty, num, text, id FROM %3;"
- "\nEND" ).arg( procName ).arg( tableName ).arg( tableName ) ) );
- else if (dbType == QSqlDriver::DB2)
- QVERIFY_SQL( q, exec( QString( "CREATE PROCEDURE %1()"
- "\nRESULT SETS 2"
- "\nLANGUAGE SQL"
- "\np1:BEGIN"
- "\nDECLARE cursor1 CURSOR WITH RETURN FOR SELECT id, text FROM %2;"
- "\nDECLARE cursor2 CURSOR WITH RETURN FOR SELECT empty, num, text, id FROM %3;"
- "\nOPEN cursor1;"
- "\nOPEN cursor2;"
- "\nEND p1" ).arg( procName ).arg( tableName ).arg( tableName ) ) );
- else if (dbType == QSqlDriver::PostgreSQL)
- QVERIFY_SQL(q, exec(QString("CREATE FUNCTION %1(ref1 refcursor, ref2 refcursor)"
- "\nRETURNS SETOF refcursor AS $$"
- "\nBEGIN"
- "\nOPEN ref1 FOR SELECT id, text FROM %2;"
- "\nRETURN NEXT ref1;"
- "\nOPEN ref2 FOR SELECT empty, num, text, id FROM %2;"
- "\nRETURN NEXT ref2;"
- "\nEND;"
- "\n$$ LANGUAGE plpgsql").arg(procName).arg(tableName)));
- else
- QVERIFY_SQL( q, exec( QString( "CREATE PROCEDURE %1"
- "\nAS"
- "\nSELECT id, text FROM %2"
- "\nSELECT empty, num, text, id FROM %3" ).arg( procName ).arg( tableName ).arg( tableName ) ) );
-
- if (dbType == QSqlDriver::MySqlServer || dbType == QSqlDriver::DB2) {
- q.setForwardOnly( true );
- QVERIFY_SQL( q, exec( QString( "CALL %1()" ).arg( procName ) ) );
- } else if (dbType == QSqlDriver::PostgreSQL) {
+ auto dropProc = [&]() {
+ q.exec(QLatin1String(dbType == QSqlDriver::PostgreSQL
+ ? "DROP FUNCTION %1(refcursor, refcursor);"
+ : "DROP PROCEDURE %1;").arg(procName));
+ };
+ dropProc(); // To make sure it's not there before we start.
+
+ QLatin1String creator;
+ switch (dbType) {
+ case QSqlDriver::MySqlServer:
+ creator = QLatin1String("CREATE PROCEDURE %1()\n"
+ "BEGIN\n"
+ " SELECT id, text FROM %2;\n"
+ " SELECT empty, num, text, id FROM %2;\n"
+ "END");
+ break;
+ case QSqlDriver::DB2:
+ creator = QLatin1String("CREATE PROCEDURE %1()\n"
+ "RESULT SETS 2\n"
+ "LANGUAGE SQL\n"
+ "p1:BEGIN\n"
+ " DECLARE cursor1 CURSOR WITH RETURN FOR "
+ "SELECT id, text FROM %2;\n"
+ " DECLARE cursor2 CURSOR WITH RETURN FOR "
+ "SELECT empty, num, text, id FROM %2;\n"
+ " OPEN cursor1;\n"
+ " OPEN cursor2;\n"
+ "END p1");
+ break;
+ case QSqlDriver::PostgreSQL:
+ creator = QLatin1String("CREATE FUNCTION %1(ref1 refcursor, ref2 refcursor)\n"
+ "RETURNS SETOF refcursor AS $$\n"
+ "BEGIN\n"
+ " OPEN ref1 FOR SELECT id, text FROM %2;\n"
+ " RETURN NEXT ref1;\n"
+ " OPEN ref2 FOR SELECT empty, num, text, id FROM %2;\n"
+ " RETURN NEXT ref2;\n"
+ "END;\n"
+ "$$ LANGUAGE plpgsql");
+ break;
+ default:
+ creator = QLatin1String("CREATE PROCEDURE %1\n"
+ "AS\n"
+ "SELECT id, text FROM %2\n"
+ "SELECT empty, num, text, id FROM %2");
+ break;
+ }
+ QVERIFY_SQL(q, exec(creator.arg(procName, tableName)));
+ const auto tidier = qScopeGuard(dropProc);
+
+ QLatin1String caller;
+ switch (dbType) {
+ case QSqlDriver::MySqlServer:
+ case QSqlDriver::DB2:
+ q.setForwardOnly(true);
+ caller = QLatin1String("CALL %1()");
+ break;
+ case QSqlDriver::PostgreSQL:
// Returning multiple result sets from PostgreSQL stored procedure:
// http://sqlines.com/postgresql/how-to/return_result_set_from_stored_procedure
- QVERIFY_SQL(q, exec(QString("BEGIN;"
- "SELECT %1('cur1', 'cur2');"
- "FETCH ALL IN cur1;"
- "FETCH ALL IN cur2;"
- "COMMIT;").arg(procName)));
- } else {
- QVERIFY_SQL( q, exec( QString( "EXEC %1" ).arg( procName ) ) );
+ caller = QLatin1String("BEGIN;"
+ " SELECT %1('cur1', 'cur2');"
+ " FETCH ALL IN cur1;"
+ " FETCH ALL IN cur2;"
+ "COMMIT;");
+ break;
+ default:
+ caller = QLatin1String("EXEC %1");
+ break;
}
+ QVERIFY_SQL(q, exec(caller.arg(procName)));
if (dbType == QSqlDriver::PostgreSQL) {
// First result set - start of transaction
@@ -3375,29 +3399,29 @@ void tst_QSqlQuery::nextResult()
QVERIFY(q.nextResult());
}
- for ( int i = 0; i < 4; i++ ) {
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toInt(), i+1 );
- QCOMPARE( q.value( 1 ).toString(), tstStrings.at( i ) );
+ for (int i = 0; i < 4; ++i) {
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toInt(), i + 1);
+ QCOMPARE(q.value(1).toString(), tstStrings[i]);
}
- QVERIFY_SQL( q, nextResult() );
-
- QVERIFY_SQL( q, isActive() );
+ QVERIFY_SQL(q, nextResult());
+ QVERIFY_SQL(q, isActive());
- for ( int i = 0; i < 4; i++ ) {
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toString(), QString( "Yatta!" ) );
- QCOMPARE( q.value( 1 ).toDouble(), 1.1*( 1+i ) );
- QCOMPARE( q.value( 2 ).toString(), tstStrings.at( i ) );
- QCOMPARE( q.value( 3 ).toInt(), 1+i );
+ for (int i = 0; i < 4; ++i) {
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toString(), u"Yatta!");
+ QCOMPARE(q.value(1).toDouble(), 1.1 * (1 + i));
+ QCOMPARE(q.value(2).toString(), tstStrings[i]);
+ QCOMPARE(q.value(3).toInt(), 1 + i);
}
// MySQL also counts the CALL itself as a result
if (dbType == QSqlDriver::MySqlServer) {
- QVERIFY( q.nextResult() );
- QVERIFY( !q.isSelect() ); // ... but it's not a select
- QCOMPARE( q.numRowsAffected(), 0 ); // ... and no rows are affected (at least not with this procedure)
+ QVERIFY(q.nextResult());
+ QVERIFY(!q.isSelect()); // ... but it's not a select
+ // ... and no rows are affected (at least not with this procedure):
+ QCOMPARE(q.numRowsAffected(), 0);
}
if (dbType == QSqlDriver::PostgreSQL) {
// Last result set - commit transaction
@@ -3406,14 +3430,8 @@ void tst_QSqlQuery::nextResult()
QCOMPARE(q.numRowsAffected(), 0);
}
- QVERIFY( !q.nextResult() );
-
- QVERIFY( !q.isActive() );
-
- if (dbType == QSqlDriver::PostgreSQL)
- q.exec(QString("DROP FUNCTION %1(refcursor, refcursor);").arg(procName));
- else
- q.exec(QString("DROP PROCEDURE %1;").arg(procName));
+ QVERIFY(!q.nextResult());
+ QVERIFY(!q.isActive());
}
@@ -3422,76 +3440,76 @@ void tst_QSqlQuery::nextResult()
// enough to be run with all backends.
void tst_QSqlQuery::blobsPreparedQuery()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- if ( !db.driver()->hasFeature( QSqlDriver::BLOB ) || !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) )
- QSKIP( "DBMS does not support BLOBs or prepared queries");
+ if (!db.driver()->hasFeature(QSqlDriver::BLOB)
+ || !db.driver()->hasFeature(QSqlDriver::PreparedQueries)) {
+ QSKIP("DBMS does not support BLOBs or prepared queries");
+ }
const QString tableName(qTableName("blobstest", __FILE__, db));
- QSqlQuery q( db );
- q.setForwardOnly( true ); // This is needed to make the test work with DB2.
- QString shortBLOB( "abc" );
- QString longerBLOB( "abcdefghijklmnopqrstuvxyz¿äëïöü¡ " );
+ QSqlQuery q(db);
+ q.setForwardOnly(true); // This is needed to make the test work with DB2.
+ QString shortBLOB("abc");
+ QString longerBLOB("abcdefghijklmnopqrstuvxyz¿äëïöü¡ ");
// In PostgreSQL a BLOB is not called a BLOB, but a BYTEA! :-)
// ... and in SQL Server it can be called a lot, but IMAGE will do.
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- QString typeName( "BLOB" );
- if (dbType == QSqlDriver::PostgreSQL)
- typeName = "BYTEA";
- else if (dbType == QSqlDriver::MSSqlServer)
- typeName = "IMAGE";
-
- QVERIFY_SQL( q, exec( QString( "CREATE TABLE %1(id INTEGER, data %2)" ).arg( tableName ).arg( typeName ) ) );
- q.prepare( QString( "INSERT INTO %1(id, data) VALUES(:id, :data)" ).arg( tableName ) );
- q.bindValue( ":id", 1 );
- q.bindValue( ":data", shortBLOB );
- QVERIFY_SQL( q, exec() );
+ const QLatin1String typeName(dbType == QSqlDriver::PostgreSQL ? "BYTEA"
+ : dbType == QSqlDriver::MSSqlServer ? "IMAGE" : "BLOB");
+
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1(id INTEGER, data %2)")
+ .arg(tableName, typeName)));
+ q.prepare(QLatin1String("INSERT INTO %1(id, data) VALUES(:id, :data)").arg(tableName));
+ q.bindValue(":id", 1);
+ q.bindValue(":data", shortBLOB);
+ QVERIFY_SQL(q, exec());
- q.bindValue( ":id", 2 );
- q.bindValue( ":data", longerBLOB );
- QVERIFY_SQL( q, exec() );
+ q.bindValue(":id", 2);
+ q.bindValue(":data", longerBLOB);
+ QVERIFY_SQL(q, exec());
// Two executions and result sets
- q.prepare( QString( "SELECT data FROM %1 WHERE id = ?" ).arg( tableName ) );
- q.bindValue( 0, QVariant( 1 ) );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toString(), shortBLOB );
+ q.prepare(QLatin1String("SELECT data FROM %1 WHERE id = ?").arg(tableName));
+ q.bindValue(0, QVariant(1));
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toString(), shortBLOB);
- q.bindValue( 0, QVariant( 2 ) );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toString().toUtf8(), longerBLOB.toUtf8() );
+ q.bindValue(0, QVariant(2));
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toString().toUtf8(), longerBLOB.toUtf8());
// Only one execution and result set
- q.prepare( QString( "SELECT id, data FROM %1 ORDER BY id" ).arg( tableName ) );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 1 ).toString(), shortBLOB );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 1 ).toString(), longerBLOB );
+ q.prepare(QLatin1String("SELECT id, data FROM %1 ORDER BY id").arg(tableName));
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(1).toString(), shortBLOB);
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(1).toString(), longerBLOB);
}
// There were problems with navigating past the end of a table returning an error on mysql
void tst_QSqlQuery::emptyTableNavigate()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
{
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tbl = qTableName("qtest_empty", __FILE__, db);
q.exec("drop table " + tbl);
- QVERIFY_SQL(q, exec("create table " + tbl + " (id char(10))"));
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (id char(10))").arg(tbl)));
QVERIFY_SQL(q, prepare("select * from " + tbl));
- QVERIFY_SQL( q, exec() );
- QVERIFY( !q.next() );
- QCOMPARE( q.lastError().isValid(), false );
+ QVERIFY_SQL(q, exec());
+ QVERIFY(!q.next());
+ QVERIFY(!q.lastError().isValid());
}
}
@@ -3503,121 +3521,125 @@ void tst_QSqlQuery::timeStampParsing()
const QString tableName(qTableName("timeStampParsing", __FILE__, db));
tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType == QSqlDriver::PostgreSQL) {
- QVERIFY_SQL(q, exec(QStringLiteral("CREATE TABLE ") + tableName + QStringLiteral("("
- "id serial NOT NULL, "
- "datefield timestamp, primary key(id));")));
- } else if (dbType == QSqlDriver::MySqlServer) {
- QVERIFY_SQL(q, exec(QStringLiteral("CREATE TABLE ") + tableName + QStringLiteral("("
- "id integer NOT NULL AUTO_INCREMENT,"
- "datefield timestamp, primary key(id));")));
- } else if (dbType == QSqlDriver::Interbase) {
+ QLatin1String creator;
+ switch (tst_Databases::getDatabaseType(db)) {
+ case QSqlDriver::PostgreSQL:
+ creator = QLatin1String("CREATE TABLE %1(id serial NOT NULL, "
+ "datefield timestamp, primary key(id));");
+ break;
+ case QSqlDriver::MySqlServer:
+ creator = QLatin1String("CREATE TABLE %1(id integer NOT NULL AUTO_INCREMENT, "
+ "datefield timestamp, primary key(id));");
+ break;
+ case QSqlDriver::Interbase:
// Since there is no auto-increment feature in Interbase we allow it to be null
- QVERIFY_SQL(q, exec(QStringLiteral("CREATE TABLE ") + tableName + QStringLiteral("("
- "id integer,"
- "datefield timestamp);")));
- } else {
- QVERIFY_SQL(q, exec(QStringLiteral("CREATE TABLE ") + tableName + QStringLiteral("("
- "\"id\" integer NOT NULL PRIMARY KEY AUTOINCREMENT,"
- "\"datefield\" timestamp);")));
+ creator = QLatin1String("CREATE TABLE %1(id integer, datefield timestamp);");
+ break;
+ default:
+ creator = QLatin1String("CREATE TABLE %1("
+ "\"id\" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "
+ "\"datefield\" timestamp);");
+ break;
}
- QVERIFY_SQL(q, exec(
- QStringLiteral("INSERT INTO ") + tableName + QStringLiteral(" (datefield) VALUES (current_timestamp);"
- )));
- QVERIFY_SQL(q, exec(QStringLiteral("SELECT * FROM ") + tableName));
+ QVERIFY_SQL(q, exec(creator.arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (datefield) VALUES (current_timestamp);")
+ .arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT * FROM ") + tableName));
while (q.next())
QVERIFY(q.value(1).toDateTime().isValid());
}
void tst_QSqlQuery::task_217003()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- QSqlQuery q( db );
- const QString Planet(qTableName( "Planet", __FILE__, db));
-
- q.exec("drop table " + Planet);
- QVERIFY_SQL( q, exec( "create table " + Planet + " (Name varchar(20))" ) );
- QVERIFY_SQL( q, exec( "insert into " + Planet + " VALUES ('Mercury')" ) );
- QVERIFY_SQL( q, exec( "insert into " + Planet + " VALUES ('Venus')" ) );
- QVERIFY_SQL( q, exec( "insert into " + Planet + " VALUES ('Earth')" ) );
- QVERIFY_SQL( q, exec( "insert into " + Planet + " VALUES ('Mars')" ) );
-
- QVERIFY_SQL( q, exec( "SELECT Name FROM " + Planet ) );
- QVERIFY_SQL( q, seek( 3 ) );
- QCOMPARE( q.value( 0 ).toString(), QString( "Mars" ) );
- QVERIFY_SQL( q, seek( 1 ) );
- QCOMPARE( q.value( 0 ).toString(), QString( "Venus" ) );
- QVERIFY_SQL( q, exec( "SELECT Name FROM " + Planet ) );
- QVERIFY_SQL( q, seek( 3 ) );
- QCOMPARE( q.value( 0 ).toString(), QString( "Mars" ) );
- QVERIFY_SQL( q, seek( 0 ) );
- QCOMPARE( q.value( 0 ).toString(), QString( "Mercury" ) );
- QVERIFY_SQL( q, seek( 1 ) );
- QCOMPARE( q.value( 0 ).toString(), QString( "Venus" ) );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ QSqlQuery q(db);
+ const QString planets = qTableName("Planet", __FILE__, db);
+
+ q.exec("drop table " + planets);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (Name varchar(20))").arg(planets)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mercury')").arg(planets)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Venus')").arg(planets)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Earth')").arg(planets)));
+ QVERIFY_SQL(q, exec(QLatin1String("insert into %1 VALUES ('Mars')").arg(planets)));
+
+ QVERIFY_SQL(q, exec("SELECT Name FROM " + planets));
+ QVERIFY_SQL(q, seek(3));
+ QCOMPARE(q.value(0).toString(), u"Mars");
+ QVERIFY_SQL(q, seek(1));
+ QCOMPARE(q.value(0).toString(), u"Venus");
+ QVERIFY_SQL(q, exec("SELECT Name FROM " + planets));
+ QVERIFY_SQL(q, seek(3));
+ QCOMPARE(q.value(0).toString(), u"Mars");
+ QVERIFY_SQL(q, seek(0));
+ QCOMPARE(q.value(0).toString(), u"Mercury");
+ QVERIFY_SQL(q, seek(1));
+ QCOMPARE(q.value(0).toString(), u"Venus");
}
void tst_QSqlQuery::task_250026()
{
- QString data258, data1026;
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- QSqlQuery q( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ QSqlQuery q(db);
const QString tableName(qTableName("task_250026", __FILE__, db));
- if ( !q.exec( "create table " + tableName + " (longfield varchar(1100))" ) ) {
+ if (!q.exec(QLatin1String("create table %1 (longfield varchar(1100))").arg(tableName))) {
qDebug() << "Error" << q.lastError();
- QSKIP( "Db doesn't support \"1100\" as a size for fields");
+ QSKIP("Db doesn't support \"1100\" as a size for fields");
}
- data258.fill( 'A', 258 );
- data1026.fill( 'A', 1026 );
- QVERIFY_SQL( q, prepare( "insert into " + tableName + "(longfield) VALUES (:longfield)" ) );
- q.bindValue( ":longfield", data258 );
- QVERIFY_SQL( q, exec() );
- q.bindValue( ":longfield", data1026 );
- QVERIFY_SQL( q, exec() );
- QVERIFY_SQL( q, exec( "select * from " + tableName ) );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toString().length(), data258.length() );
- QVERIFY_SQL( q, next() );
- QCOMPARE( q.value( 0 ).toString().length(), data1026.length() );
+ const QString data258(258, QLatin1Char('A'));
+ const QString data1026(1026, QLatin1Char('A'));
+ QVERIFY_SQL(q, prepare(QLatin1String("insert into %1(longfield) VALUES (:longfield)")
+ .arg(tableName)));
+ q.bindValue(":longfield", data258);
+ QVERIFY_SQL(q, exec());
+ q.bindValue(":longfield", data1026);
+ QVERIFY_SQL(q, exec());
+ QVERIFY_SQL(q, exec("select * from " + tableName));
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toString().length(), data258.length());
+ QVERIFY_SQL(q, next());
+ QCOMPARE(q.value(0).toString().length(), data1026.length());
}
void tst_QSqlQuery::crashQueryOnCloseDatabase()
{
for (const auto &dbName : qAsConst(dbs.dbNames)) {
+ const auto tidier = qScopeGuard([]() { QSqlDatabase::removeDatabase("crashTest"); });
+ // Note: destruction of clonedDb needs to happen before we call removeDatabase.
QSqlDatabase clonedDb = QSqlDatabase::cloneDatabase(
QSqlDatabase::database(dbName), "crashTest");
qDebug() << "Testing crash in sqlquery dtor for driver" << clonedDb.driverName();
QVERIFY(clonedDb.open());
QSqlQuery q(clonedDb);
clonedDb.close();
- QSqlDatabase::removeDatabase("crashTest");
}
}
void tst_QSqlQuery::task_233829()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
- QSqlQuery q( db );
+ QSqlQuery q(db);
const QString tableName(qTableName("task_233829", __FILE__, db));
- QVERIFY_SQL(q,exec("CREATE TABLE " + tableName + "(dbl1 double precision,dbl2 double precision) without oids;"));
-
- QString queryString("INSERT INTO " + tableName +"(dbl1, dbl2) VALUES(?,?)");
-
- double k = 0.0;
- QVERIFY_SQL(q,prepare(queryString));
- q.bindValue(0,0.0 / k); // nan
- q.bindValue(1,0.0 / k); // nan
- QVERIFY_SQL(q,exec());
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "CREATE TABLE %1(dbl1 double precision,dbl2 double precision) "
+ "without oids;").arg(tableName)));
+ const QString queryString =
+ QLatin1String("INSERT INTO %1(dbl1, dbl2) VALUES(?,?)").arg(tableName);
+
+ const double nan = qQNaN();
+ QVERIFY_SQL(q, prepare(queryString));
+ q.bindValue(0, nan);
+ q.bindValue(1, nan);
+ QVERIFY_SQL(q, exec());
}
void tst_QSqlQuery::QTBUG_12477()
@@ -3626,7 +3648,7 @@ void tst_QSqlQuery::QTBUG_12477()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
if (!db.driverName().startsWith("QPSQL"))
- QSKIP("PostgreSQL specific test");
+ QSKIP("PostgreSQL-specific test");
QSqlQuery q(db);
QVERIFY_SQL(q, exec("SELECT 1::bit, '10101010000111101101'::varbit, "
@@ -3663,75 +3685,72 @@ void tst_QSqlQuery::QTBUG_12477()
void tst_QSqlQuery::sqlServerReturn0()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType != QSqlDriver::MSSqlServer)
- QSKIP("SQL Server specific test");
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
+ QSKIP("Test is specific to SQL Server");
- const QString tableName(qTableName("test141895", __FILE__, db)), procName(qTableName("test141895_proc", __FILE__, db));
- QSqlQuery q( db );
+ const QString tableName(qTableName("test141895", __FILE__, db));
+ const QString procName(qTableName("test141895_proc", __FILE__, db));
+ QSqlQuery q(db);
q.exec("DROP TABLE " + tableName);
q.exec("DROP PROCEDURE " + procName);
- QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+" (id integer)"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" (id) VALUES (1)"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" (id) VALUES (2)"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" (id) VALUES (2)"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" (id) VALUES (3)"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" (id) VALUES (1)"));
- QVERIFY_SQL(q, exec("CREATE PROCEDURE "+procName+
- " AS "
- "SELECT * FROM "+tableName+" WHERE ID = 2 "
- "RETURN 0"));
-
- QVERIFY_SQL(q, exec("{CALL " + procName + QLatin1Char('}')));
-
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id integer)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (1)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (2)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (2)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (3)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (1)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE PROCEDURE %1 AS "
+ "SELECT * FROM %1 WHERE ID = 2 "
+ "RETURN 0").arg(tableName)));
+
+ QVERIFY_SQL(q, exec(QLatin1String("{CALL %1}").arg(procName)));
QVERIFY_SQL(q, next());
}
void tst_QSqlQuery::QTBUG_551()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
const QString pkgname(qTableName("pkg", __FILE__, db));
- QVERIFY_SQL(q, exec("CREATE OR REPLACE PACKAGE "+pkgname+" IS \n\
- \n\
- TYPE IntType IS TABLE OF INTEGER INDEX BY BINARY_INTEGER;\n\
- TYPE VCType IS TABLE OF VARCHAR2(60) INDEX BY BINARY_INTEGER;\n\
- PROCEDURE P (Inp IN IntType, Outp OUT VCType);\n\
- END "+ pkgname + QLatin1Char(';')));
-
- QVERIFY_SQL(q, exec("CREATE OR REPLACE PACKAGE BODY "+pkgname+" IS\n\
- PROCEDURE P (Inp IN IntType, Outp OUT VCType)\n\
- IS\n\
- BEGIN\n\
- Outp(1) := '1. Value is ' ||TO_CHAR(Inp(1));\n\
- Outp(2) := '2. Value is ' ||TO_CHAR(Inp(2));\n\
- Outp(3) := '3. Value is ' ||TO_CHAR(Inp(3));\n\
- END p;\n\
- END " + pkgname + QLatin1Char(';')));
-
- QVariantList inLst, outLst, res_outLst;
-
- q.prepare("begin "+pkgname+".p(:inp, :outp); end;");
-
- QString StVal;
- StVal.reserve(60);
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "CREATE OR REPLACE PACKAGE %1 IS \n\n"
+ "TYPE IntType IS TABLE OF INTEGER INDEX BY BINARY_INTEGER;\n"
+ "TYPE VCType IS TABLE OF VARCHAR2(60) INDEX BY BINARY_INTEGER;\n"
+ "PROCEDURE P (Inp IN IntType, Outp OUT VCType);\n"
+ "END %1;").arg(pkgname)));
+
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE OR REPLACE PACKAGE BODY %1 IS\n"
+ "PROCEDURE P (Inp IN IntType, Outp OUT VCType)\n"
+ " IS\n"
+ " BEGIN\n"
+ " Outp(1) := '1. Value is ' ||TO_CHAR(Inp(1));\n"
+ " Outp(2) := '2. Value is ' ||TO_CHAR(Inp(2));\n"
+ " Outp(3) := '3. Value is ' ||TO_CHAR(Inp(3));\n"
+ " END p;\n"
+ "END %1;").arg(pkgname)));
+
+ q.prepare(QLatin1String("begin %1.p(:inp, :outp); end;").arg(pkgname));
+
+ QString text;
+ text.reserve(60);
// loading arrays
- for (int Cnt=0; Cnt < 3; Cnt++) {
- inLst << Cnt;
- outLst << StVal;
+ QVariantList inLst, outLst;
+ for (int count = 0; count < 3; ++count) {
+ inLst << count;
+ outLst << text;
}
q.bindValue(":inp", inLst);
q.bindValue(":outp", outLst, QSql::Out);
- QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns) );
- res_outLst = qvariant_cast<QVariantList>(q.boundValues().at(1));
+ QVERIFY_SQL(q, execBatch(QSqlQuery::ValuesAsColumns));
+ const auto res_outLst = qvariant_cast<QVariantList>(q.boundValues().at(1));
QCOMPARE(res_outLst[0].toString(), QLatin1String("1. Value is 0"));
QCOMPARE(res_outLst[1].toString(), QLatin1String("2. Value is 1"));
@@ -3740,21 +3759,18 @@ void tst_QSqlQuery::QTBUG_551()
void tst_QSqlQuery::QTBUG_12186()
{
- QFETCH( QString, dbName );
+ QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
- // make sure that query.boundValues() returns the values in the right order
- // even for more than 16 placeholders
+ // Make sure that query.boundValues() returns the values in the right order
+ // even for more than 16 placeholders:
QSqlQuery query(db);
- query.prepare("INSERT INTO person (col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15, col16, col17, col18) "
+ query.prepare("INSERT INTO person (col1, col2, col3, col4, col5, col6, col7, col8, col9, "
+ "col10, col11, col12, col13, col14, col15, col16, col17, col18) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
- QList<QVariant> values;
-
- for (int i = 0; i < 18; ++i)
- values << i;
-
- foreach (QVariant v, values)
+ const QList<QVariant> values = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
+ for (const QVariant &v : values)
query.bindValue(v.toInt(), v);
QCOMPARE(query.boundValues(), values);
@@ -3762,18 +3778,18 @@ void tst_QSqlQuery::QTBUG_12186()
void tst_QSqlQuery::QTBUG_14132()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
const QString procedureName(qTableName("procedure", __FILE__, db));
- QVERIFY_SQL(q, exec("CREATE OR REPLACE PROCEDURE "+ procedureName + " (outStr OUT varchar2) \n\
- is \n\
- begin \n\
- outStr := 'OUTSTRING'; \n\
- end;"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE OR REPLACE PROCEDURE %1 (outStr OUT varchar2)\n"
+ "is\n"
+ "begin\n"
+ " outStr := 'OUTSTRING'; \n"
+ "end;").arg(procedureName)));
QString placeholder = "XXXXXXXXX";
- QVERIFY(q.prepare("CALL "+procedureName+"(?)"));
+ QVERIFY(q.prepare(QLatin1String("CALL %1(?)").arg(procedureName)));
q.addBindValue(placeholder, QSql::Out);
QVERIFY_SQL(q, exec());
QCOMPARE(q.boundValue(0).toString(), QLatin1String("OUTSTRING"));
@@ -3786,21 +3802,20 @@ void tst_QSqlQuery::QTBUG_18435()
CHECK_DATABASE(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType != QSqlDriver::MSSqlServer || !db.driverName().startsWith("QODBC"))
- QSKIP("SQL Server specific test");
+ QSKIP("Test is specific to SQL Server");
QSqlQuery q(db);
QString procName(qTableName("qtbug_18435_proc", __FILE__, db));
q.exec("DROP PROCEDURE " + procName);
- const QString stmt =
- "CREATE PROCEDURE " + procName + " @key nvarchar(50) OUTPUT AS\n"
- "BEGIN\n"
- " SET NOCOUNT ON\n"
- " SET @key = 'TEST'\n"
- "END\n";
+ const QString stmt = QLatin1String("CREATE PROCEDURE %1 @key nvarchar(50) OUTPUT AS\n"
+ "BEGIN\n"
+ " SET NOCOUNT ON\n"
+ " SET @key = 'TEST'\n"
+ "END\n").arg(procName);
QVERIFY_SQL(q, exec(stmt));
- QVERIFY_SQL(q, prepare("{CALL "+ procName +"(?)}"));
+ QVERIFY_SQL(q, prepare(QLatin1String("{CALL %1(?)}").arg(procName)));
const QString testStr = "0123";
q.bindValue(0, testStr, QSql::Out);
QVERIFY_SQL(q, exec());
@@ -3811,51 +3826,56 @@ void tst_QSqlQuery::QTBUG_18435()
void tst_QSqlQuery::QTBUG_5251()
{
- // Since QSqlTableModel will escape the identifiers, we need to escape
- // them for databases that are case sensitive
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ // Since QSqlTableModel will escape the identifiers, we need to escape them
+ // for databases that are case sensitive.
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString timetest(qTableName("timetest", __FILE__, db));
tst_Databases::safeDropTable(db, timetest);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec(QStringLiteral("CREATE TABLE ") + timetest + QStringLiteral(" (t TIME)")));
- QVERIFY_SQL(q, exec(QStringLiteral("INSERT INTO ") + timetest +
- QStringLiteral(" VALUES ('1:2:3.666')")));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (t TIME)").arg(timetest)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO VALUES ('1:2:3.666')").arg(timetest)));
- QSqlTableModel timetestModel(0,db);
+ QSqlTableModel timetestModel(0, db);
timetestModel.setEditStrategy(QSqlTableModel::OnManualSubmit);
timetestModel.setTable(timetest);
QVERIFY_SQL(timetestModel, select());
- QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"), QString("01:02:03.666"));
- QVERIFY_SQL(timetestModel,setData(timetestModel.index(0, 0), QTime(0,12,34,500)));
- QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"), QString("00:12:34.500"));
+ QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"),
+ u"01:02:03.666");
+ QVERIFY_SQL(timetestModel, setData(timetestModel.index(0, 0), QTime(0, 12, 34, 500)));
+ QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"),
+ u"00:12:34.500");
QVERIFY_SQL(timetestModel, submitAll());
- QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"), QString("00:12:34.500"));
+ QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"),
+ u"00:12:34.500");
- QVERIFY_SQL(q, exec(QStringLiteral("UPDATE ") + timetest +
- QStringLiteral(" SET t = '0:11:22.33'")));
+ QVERIFY_SQL(q, exec(QLatin1String("UPDATE %1 SET t = '0:11:22.33'").arg(timetest)));
QVERIFY_SQL(timetestModel, select());
- QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"), QString("00:11:22.330"));
-
+ QCOMPARE(timetestModel.record(0).field(0).value().toTime().toString("HH:mm:ss.zzz"),
+ u"00:11:22.330");
}
void tst_QSqlQuery::QTBUG_6421()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
const QString tableName(qTableName("bug6421", __FILE__, db).toUpper());
- QVERIFY_SQL(q, exec("create table "+tableName+"(COL1 char(10), COL2 char(10), COL3 char(10))"));
- QVERIFY_SQL(q, exec("create index INDEX1 on "+tableName+" (COL1 desc)"));
- QVERIFY_SQL(q, exec("create index INDEX2 on "+tableName+" (COL2 desc)"));
- QVERIFY_SQL(q, exec("create index INDEX3 on "+tableName+" (COL3 desc)"));
+ QVERIFY_SQL(q, exec(QLatin1String(
+ "create table %1(COL1 char(10), COL2 char(10), COL3 char(10))")
+ .arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("create index INDEX1 on %1 (COL1 desc)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("create index INDEX2 on %1 (COL2 desc)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("create index INDEX3 on %1 (COL3 desc)").arg(tableName)));
q.setForwardOnly(true);
- QVERIFY_SQL(q, exec("select COLUMN_EXPRESSION from ALL_IND_EXPRESSIONS where TABLE_NAME='" + tableName + QLatin1Char('\'')));
+ QVERIFY_SQL(q, exec(QLatin1String("select COLUMN_EXPRESSION from ALL_IND_EXPRESSIONS "
+ "where TABLE_NAME='%1'")
+ .arg(tableName)));
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toString(), QLatin1String("\"COL1\""));
QVERIFY_SQL(q, next());
@@ -3866,53 +3886,54 @@ void tst_QSqlQuery::QTBUG_6421()
void tst_QSqlQuery::QTBUG_6618()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType != QSqlDriver::MSSqlServer)
- QSKIP("SQL Server specific test");
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ if (tst_Databases::getDatabaseType(db) != QSqlDriver::MSSqlServer)
+ QSKIP("Test is specific to SQL Server");
QSqlQuery q(db);
- q.exec("drop procedure " + qTableName("tst_raiseError", __FILE__, db)); //non-fatal
+ const QString procedureName = qTableName("tst_raiseError", __FILE__, db);
+ q.exec("drop procedure " + procedureName); // non-fatal
QString errorString;
- for (int i=0;i<110;i++)
- errorString+="reallylong";
- errorString+=" error";
- QVERIFY_SQL(q, exec("create procedure " + qTableName("tst_raiseError", __FILE__, db) + " as\n"
- "begin\n"
- " raiserror('" + errorString + "', 16, 1)\n"
- "end\n" ));
- q.exec("{call " + qTableName("tst_raiseError", __FILE__, db) + QLatin1Char('}'));
+ for (int i = 0; i < 110; ++i)
+ errorString += "reallylong";
+ errorString += " error";
+ QVERIFY_SQL(q, exec(QLatin1String("create procedure %1 as\n"
+ "begin\n"
+ " raiserror('%2', 16, 1)\n"
+ "end\n").arg(procedureName, errorString)));
+ q.exec(QLatin1String("{call %1}").arg(procedureName));
QVERIFY(q.lastError().text().contains(errorString));
}
void tst_QSqlQuery::QTBUG_6852()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
- const QString tableName(qTableName("bug6852", __FILE__, db)), procName(qTableName("bug6852_proc", __FILE__, db));
-
- QVERIFY_SQL(q, exec("DROP PROCEDURE IF EXISTS "+procName));
- QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(\n"
- "MainKey INT NOT NULL,\n"
- "OtherTextCol VARCHAR(45) NOT NULL,\n"
- "PRIMARY KEY(`MainKey`))"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(0, \"Disabled\")"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(5, \"Error Only\")"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(10, \"Enabled\")"));
- QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(15, \"Always\")"));
- QVERIFY_SQL(q, exec("CREATE PROCEDURE "+procName+"()\n"
- "READS SQL DATA\n"
- "BEGIN\n"
- " SET @st = 'SELECT MainKey, OtherTextCol from "+tableName+"';\n"
- " PREPARE stmt from @st;\n"
- " EXECUTE stmt;\n"
- "END;"));
-
- QVERIFY_SQL(q, exec("CALL "+procName+"()"));
+ 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(QLatin1String("CREATE TABLE %1(\n"
+ "MainKey INT NOT NULL,\n"
+ "OtherTextCol VARCHAR(45) NOT NULL,\n"
+ "PRIMARY KEY(`MainKey`))").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(0, \"Disabled\")").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(5, \"Error Only\")").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(10, \"Enabled\")").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 VALUES(15, \"Always\")").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE PROCEDURE %1()\n"
+ "READS SQL DATA\n"
+ "BEGIN\n"
+ " SET @st = 'SELECT MainKey, OtherTextCol from %2';\n"
+ " PREPARE stmt from @st;\n"
+ " EXECUTE stmt;\n"
+ "END;").arg(procName, tableName)));
+
+ QVERIFY_SQL(q, exec(QLatin1String("CALL %1()").arg(procName)));
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toInt(), 0);
QCOMPARE(q.value(1).toString(), QLatin1String("Disabled"));
@@ -3920,21 +3941,22 @@ void tst_QSqlQuery::QTBUG_6852()
void tst_QSqlQuery::QTBUG_5765()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
QSqlQuery q(db);
const QString tableName(qTableName("bug5765", __FILE__, db));
- QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(testval TINYINT(1) DEFAULT 0)"));
- q.prepare("INSERT INTO "+tableName+" SET testval = :VALUE");
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1(testval TINYINT(1) DEFAULT 0)")
+ .arg(tableName)));
+ q.prepare(QLatin1String("INSERT INTO %1 SET testval = :VALUE").arg(tableName));
q.bindValue(":VALUE", 1);
QVERIFY_SQL(q, exec());
q.bindValue(":VALUE", 12);
QVERIFY_SQL(q, exec());
q.bindValue(":VALUE", 123);
QVERIFY_SQL(q, exec());
- QString sql="select testval from "+tableName;
+ QString sql = "select testval from " + tableName;
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toInt(), 1);
@@ -3952,11 +3974,9 @@ void tst_QSqlQuery::QTBUG_5765()
QCOMPARE(q.value(0).toInt(), 123);
}
-/**
-* This test case tests multiple statements in one execution.
-* Sqlite driver doesn't support multiple statement at one time.
-* If more than one statement is given, the exec or prepare function
-* return failure to the client.
+/* Test multiple statements in one execution.
+ SQLite driver doesn't support that. If more than one statement is given, the
+ exec or prepare function return failure to the client.
*/
void tst_QSqlQuery::QTBUG_21884()
{
@@ -3965,40 +3985,44 @@ void tst_QSqlQuery::QTBUG_21884()
CHECK_DATABASE(db);
QSqlQuery q(db);
-
- QStringList stList;
QString tableName(qTableName("bug21884", __FILE__, db));
- stList << "create table " + tableName + "(id integer primary key, note string)";
- stList << "select * from " + tableName + QLatin1Char(';');
- stList << "select * from " + tableName + "; \t\n\r";
- stList << "drop table " + tableName;
-
- foreach (const QString& st, stList) {
- QVERIFY_SQL(q, exec(st));
- }
-
- foreach (const QString& st, stList) {
- QVERIFY_SQL(q, prepare(st));
- QVERIFY_SQL(q, exec());
+ {
+ const QString good[] = {
+ QLatin1String("create table %1(id integer primary key, note string)").arg(tableName),
+ QLatin1String("select * from %1;").arg(tableName),
+ QLatin1String("select * from %1; \t\n\r").arg(tableName),
+ QLatin1String("drop table %1").arg(tableName)
+ };
+
+ for (const QString &st : good)
+ QVERIFY_SQL(q, exec(st));
+
+ for (const QString &st : good) {
+ QVERIFY_SQL(q, prepare(st));
+ QVERIFY_SQL(q, exec());
+ }
}
- stList.clear();
- stList << "create table " + tableName + "(id integer primary key); select * from " + tableName;
- stList << "create table " + tableName + "(id integer primary key); syntax error!;";
- stList << "create table " + tableName + "(id integer primary key);;";
- stList << "create table " + tableName + "(id integer primary key);\'\"\a\b\b\v";
-
- foreach (const QString&st , stList) {
- QVERIFY2(!q.prepare(st), qPrintable(QString("the statement is expected to fail! ") + st));
- QVERIFY2(!q.exec(st), qPrintable(QString("the statement is expected to fail! ") + st));
+ {
+ const QString bad[] = {
+ QLatin1String("create table %1(id integer primary key); select * from ").arg(tableName),
+ QLatin1String("create table %1(id integer primary key); syntax error!;").arg(tableName),
+ QLatin1String("create table %1(id integer primary key);;").arg(tableName),
+ QLatin1String("create table %1(id integer primary key);\'\"\a\b\b\v").arg(tableName)
+ };
+
+ QLatin1String shouldFail("the statement is expected to fail! %1");
+ for (const QString &st : bad) {
+ QVERIFY2(!q.prepare(st), qPrintable(shouldFail.arg(st)));
+ QVERIFY2(!q.exec(st), qPrintable(shouldFail.arg(st)));
+ }
}
}
-/**
- * This test case test sqlite driver close function. Sqlite driver should close cleanly
- * even if there is still outstanding prepared statement.
- */
+/* Test SQLite driver close function. SQLite driver should close cleanly even if
+ there is still outstanding prepared statement.
+*/
void tst_QSqlQuery::QTBUG_16967()
{
QT_WARNING_PUSH
@@ -4051,12 +4075,11 @@ QT_WARNING_DISABLE_DEPRECATED
QT_WARNING_POP
}
-/**
- * In SQLite when a boolean value is bound to a placeholder, it should be converted
- * into integer 0/1 rather than text "false"/"true". According to documentation,
- * SQLite does not have separate Boolean storage class. Instead, Boolean values are
- * stored as integers.
- */
+/* In SQLite, when a boolean value is bound to a placeholder, it should be
+ converted into integer 0/1 rather than text "false"/"true". According to
+ documentation, SQLite does not have a separate Boolean storage class.
+ Instead, Boolean values are stored as integers.
+*/
void tst_QSqlQuery::QTBUG_23895()
{
QFETCH(QString, dbName);
@@ -4066,15 +4089,16 @@ void tst_QSqlQuery::QTBUG_23895()
QSqlQuery q(db);
QString tableName(qTableName("bug23895", __FILE__, db));
- q.prepare("create table " + tableName + "(id integer primary key, val1 bool, val2 boolean)");
+ q.prepare(QLatin1String("create table %1(id integer primary key, val1 bool, val2 boolean)")
+ .arg(tableName));
QVERIFY_SQL(q, exec());
- q.prepare("insert into " + tableName + "(id, val1, val2) values(?, ?, ?);");
+ q.prepare(QLatin1String("insert into %1(id, val1, val2) values(?, ?, ?);").arg(tableName));
q.addBindValue(1);
q.addBindValue(true);
q.addBindValue(false);
QVERIFY_SQL(q, exec());
- QString sql="select * from " + tableName;
+ QString sql = "select * from " + tableName;
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
@@ -4083,24 +4107,24 @@ void tst_QSqlQuery::QTBUG_23895()
QCOMPARE(q.value(0).toInt(), 1);
QCOMPARE(q.record().field(1).metaType().id(), QMetaType::Bool);
QCOMPARE(q.value(1).metaType().id(), QMetaType::LongLong);
- QCOMPARE(q.value(1).toBool(), true);
+ QVERIFY(q.value(1).toBool());
QCOMPARE(q.record().field(2).metaType().id(), QMetaType::Bool);
QCOMPARE(q.value(2).metaType().id(), QMetaType::LongLong);
- QCOMPARE(q.value(2).toBool(), false);
+ QVERIFY(!q.value(2).toBool());
- q.prepare("insert into " + tableName + "(id, val1, val2) values(?, ?, ?);");
+ q.prepare(QLatin1String("insert into %1(id, val1, val2) values(?, ?, ?);").arg(tableName));
q.addBindValue(2);
q.addBindValue(false);
q.addBindValue(false);
QVERIFY_SQL(q, exec());
- sql="select * from " + tableName + " where val1";
+ sql = QLatin1String("select * from %1 where val1").arg(tableName);
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toInt(), 1);
QVERIFY(!q.next());
- sql="select * from " + tableName + " where not val2";
+ sql = QLatin1String("select * from %1 where not val2").arg(tableName);
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
QCOMPARE(q.value(0).toInt(), 1);
@@ -4109,9 +4133,7 @@ void tst_QSqlQuery::QTBUG_23895()
QVERIFY(!q.next());
}
-/**
- * Test for aliases with dots
- */
+// Test for aliases with dots:
void tst_QSqlQuery::QTBUG_14904()
{
QFETCH(QString, dbName);
@@ -4121,44 +4143,45 @@ void tst_QSqlQuery::QTBUG_14904()
QSqlQuery q(db);
QString tableName(qTableName("bug14904", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
- q.prepare("create table " + tableName + "(val1 bool)");
+ q.prepare(QLatin1String("create table %1(val1 bool)").arg(tableName));
QVERIFY_SQL(q, exec());
- q.prepare("insert into " + tableName + "(val1) values(?);");
+ q.prepare(QLatin1String("insert into %1(val1) values(?);").arg(tableName));
q.addBindValue(true);
QVERIFY_SQL(q, exec());
- QString sql="select val1 AS value1 from " + tableName;
+ QString sql = "select val1 AS value1 from " + tableName;
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
QCOMPARE(q.record().indexOf("value1"), 0);
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Bool);
- QCOMPARE(q.value(0).toBool(), true);
+ QVERIFY(q.value(0).toBool());
- sql="select val1 AS 'value.one' from " + tableName;
+ sql = "select val1 AS 'value.one' from " + tableName;
QVERIFY_SQL(q, exec(sql));
QVERIFY_SQL(q, next());
- QCOMPARE(q.record().indexOf("value.one"), 0); // was -1 before bug fix
+ QCOMPARE(q.record().indexOf("value.one"), 0); // Was -1 before bug fix.
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Bool);
- QCOMPARE(q.value(0).toBool(), true);
+ QVERIFY(q.value(0).toBool());
}
void tst_QSqlQuery::QTBUG_2192()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
{
const QString tableName(qTableName("bug2192", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec(QString("CREATE TABLE " + tableName + " (dt %1)").arg(tst_Databases::dateTimeTypeName(db))));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (dt %2)")
+ .arg(tableName, tst_Databases::dateTimeTypeName(db))));
QDateTime dt = QDateTime(QDate(2012, 7, 4), QTime(23, 59, 59, 999));
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (dt) VALUES (?)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 (dt) VALUES (?)").arg(tableName)));
q.bindValue(0, dt);
QVERIFY_SQL(q, exec());
@@ -4175,15 +4198,16 @@ void tst_QSqlQuery::QTBUG_2192()
void tst_QSqlQuery::QTBUG_36211()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
if (tst_Databases::getDatabaseType(db) == QSqlDriver::PostgreSQL) {
const QString tableName(qTableName("bug36211", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (dtwtz timestamptz, dtwotz timestamp)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (dtwtz timestamptz, dtwotz timestamp)")
+ .arg(tableName)));
#if QT_CONFIG(timezone)
QTimeZone l_tzBrazil("America/Sao_Paulo");
@@ -4191,7 +4215,8 @@ void tst_QSqlQuery::QTBUG_36211()
QVERIFY(l_tzBrazil.isValid());
QVERIFY(l_tzChina.isValid());
QDateTime dt = QDateTime(QDate(2014, 10, 30), QTime(14, 12, 02, 357));
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (dtwtz, dtwotz) VALUES (:dt, :dt)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 (dtwtz, dtwotz) VALUES (:dt, :dt)")
+ .arg(tableName)));
q.bindValue(":dt", dt);
QVERIFY_SQL(q, exec());
q.bindValue(":dt", dt.toTimeZone(l_tzBrazil));
@@ -4218,25 +4243,26 @@ void tst_QSqlQuery::QTBUG_36211()
void tst_QSqlQuery::QTBUG_53969()
{
- QFETCH( QString, dbName );
- QList<int> values = QList<int>() << 10 << 20 << 127 << 128 << 1, tableValues;
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ const QList<int> values = { 10, 20, 127, 128, 1 };
+ QList<int> tableValues;
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
tableValues.reserve(values.size());
if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer) {
const QString tableName(qTableName("bug53969", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id INT AUTO_INCREMENT PRIMARY KEY, "
- "test_number TINYINT(3) UNSIGNED)")
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id INT AUTO_INCREMENT PRIMARY KEY, "
+ "test_number TINYINT(3) UNSIGNED)")
.arg(tableName)));
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (test_number) VALUES (:value)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 (test_number) VALUES (:value)")
+ .arg(tableName)));
- QList<int>::iterator begin = values.begin(), end = values.end(), it;
- for (it = begin; it != end; ++it) {
- q.bindValue(":value", *it);
+ for (int value : values) {
+ q.bindValue(":value", value);
QVERIFY_SQL(q, exec());
}
@@ -4248,7 +4274,7 @@ void tst_QSqlQuery::QTBUG_53969()
tableValues.push_back(q.value(0).toUInt(&ok));
QVERIFY(ok);
}
- QCOMPARE(values, tableValues);
+ QCOMPARE(tableValues, values);
}
}
@@ -4261,141 +4287,130 @@ void tst_QSqlQuery::gisPointDatatype()
QSqlQuery sqlQuery(db);
const auto tableName = qTableName("qtbug72140", __FILE__, db);
tst_Databases::safeDropTable(db, tableName);
- QString sqlCommand = QStringLiteral("CREATE TABLE %1 (`lonlat_point` POINT NULL) ENGINE = InnoDB;").arg(tableName);
- QVERIFY(sqlQuery.exec(sqlCommand));
- sqlCommand = QStringLiteral("INSERT INTO %1(lonlat_point) VALUES(ST_GeomFromText('POINT(1 1)'));").arg(tableName);
- QVERIFY(sqlQuery.exec(sqlCommand));
- sqlCommand = QStringLiteral("SELECT * FROM %1;").arg(tableName);
- QVERIFY(sqlQuery.exec(sqlCommand));
+ QVERIFY(sqlQuery.exec(QLatin1String(
+ "CREATE TABLE %1 (`lonlat_point` POINT NULL) ENGINE = InnoDB;")
+ .arg(tableName)));
+ QVERIFY(sqlQuery.exec(QLatin1String(
+ "INSERT INTO %1(lonlat_point) VALUES(ST_GeomFromText('POINT(1 1)'));")
+ .arg(tableName)));
+ QVERIFY(sqlQuery.exec(QLatin1String("SELECT * FROM %1;").arg(tableName)));
QCOMPARE(sqlQuery.record().field(0).metaType().id(), QMetaType::QByteArray);
QVERIFY(sqlQuery.next());
}
void tst_QSqlQuery::oraOCINumber()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
const QString qtest_oraOCINumber(qTableName("qtest_oraOCINumber", __FILE__, db));
- QSqlQuery q( db );
- q.setForwardOnly( true );
- QVERIFY_SQL( q, exec( "create table " + qtest_oraOCINumber +
- " (col1 number(20), col2 number(20))" ) );
- QVERIFY(q.prepare("insert into " + qtest_oraOCINumber + " values (?, ?)"));
- QVariantList col1Values;
- QVariantList col2Values;
- col1Values << (qulonglong)(1)
- << (qulonglong)(0)
- << (qulonglong)(INT_MAX)
- << (qulonglong)(UINT_MAX)
- << (qulonglong)(LONG_MAX)
- << (qulonglong)(ULONG_MAX)
- << (qulonglong)(LLONG_MAX)
- << (qulonglong)(ULLONG_MAX);
-
- col2Values << (qlonglong)(1)
- << (qlonglong)(0)
- << (qlonglong)(-1)
- << (qlonglong)(LONG_MAX)
- << (qlonglong)(LONG_MIN)
- << (qlonglong)(ULONG_MAX)
- << (qlonglong)(LLONG_MAX)
- << (qlonglong)(LLONG_MIN);
+ QSqlQuery q(db);
+ q.setForwardOnly(true);
+ QVERIFY_SQL(q, exec(QLatin1String("create table %1 (col1 number(20), col2 number(20))")
+ .arg(qtest_oraOCINumber)));
+ QVERIFY(q.prepare(QLatin1String("insert into %1 values (?, ?)").arg(qtest_oraOCINumber)));
+
+ const QVariantList col1Values = {
+ qulonglong(1), qulonglong(0), qulonglong(INT_MAX), qulonglong(UINT_MAX),
+ qulonglong(LONG_MAX), qulonglong(ULONG_MAX), qulonglong(LLONG_MAX),
+ qulonglong(ULLONG_MAX)
+ };
+ const QVariantList col2Values = {
+ qlonglong(1), qlonglong(0), qlonglong(-1), qlonglong(LONG_MAX), qlonglong(LONG_MIN),
+ qlonglong(ULONG_MAX), qlonglong(LLONG_MAX), qlonglong(LLONG_MIN)
+ };
q.addBindValue(col1Values);
q.addBindValue(col2Values);
QVERIFY(q.execBatch());
- QString sqlStr = "select * from " + qtest_oraOCINumber + " where col1 = :bindValue0 AND col2 = :bindValue1";
- QVERIFY(q.prepare(sqlStr));
-
- q.bindValue(":bindValue0", (qulonglong)(1), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(1), QSql::InOut);
+ QVERIFY(q.prepare(QLatin1String(
+ "select * from %1 where col1 = :bindValue0 AND col2 = :bindValue1")
+ .arg(qtest_oraOCINumber)));
- QVERIFY_SQL( q, exec() );
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), qulonglong(1));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(1));
+ q.bindValue(":bindValue0", qulonglong(1), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(1), QSql::InOut);
- q.bindValue(":bindValue0", (qulonglong)(0), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(0), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(1));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(1));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(0));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(0));
+ q.bindValue(":bindValue0", qulonglong(0), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(0), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(INT_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(-1), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(0));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(0));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(INT_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(-1));
+ q.bindValue(":bindValue0", qulonglong(INT_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(-1), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(UINT_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(LONG_MAX), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(INT_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(-1));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(UINT_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(LONG_MAX));
+ q.bindValue(":bindValue0", qulonglong(UINT_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(LONG_MAX), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(LONG_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(LONG_MIN), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(UINT_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(LONG_MAX));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(LONG_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(LONG_MIN));
+ q.bindValue(":bindValue0", qulonglong(LONG_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(LONG_MIN), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(ULONG_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(ULONG_MAX), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(LONG_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(LONG_MIN));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(ULONG_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(ULONG_MAX));
+ q.bindValue(":bindValue0", qulonglong(ULONG_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(ULONG_MAX), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(LLONG_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(LLONG_MAX), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(ULONG_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(ULONG_MAX));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(LLONG_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(LLONG_MAX));
+ q.bindValue(":bindValue0", qulonglong(LLONG_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(LLONG_MAX), QSql::InOut);
+ QVERIFY_SQL(q, exec());
- q.bindValue(":bindValue0", (qulonglong)(ULLONG_MAX), QSql::InOut);
- q.bindValue(":bindValue1", (qlonglong)(LLONG_MIN), QSql::InOut);
- QVERIFY_SQL( q, exec() );
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(LLONG_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(LLONG_MAX));
- QVERIFY( q.next() );
- QCOMPARE(q.boundValue( 0 ).toULongLong(), (qulonglong)(ULLONG_MAX));
- QCOMPARE(q.boundValue( 1 ).toLongLong(), (qlonglong)(LLONG_MIN));
+ q.bindValue(":bindValue0", qulonglong(ULLONG_MAX), QSql::InOut);
+ q.bindValue(":bindValue1", qlonglong(LLONG_MIN), QSql::InOut);
+ QVERIFY_SQL(q, exec());
+ QVERIFY(q.next());
+ QCOMPARE(q.boundValue(0).toULongLong(), qulonglong(ULLONG_MAX));
+ QCOMPARE(q.boundValue(1).toLongLong(), qlonglong(LLONG_MIN));
}
void tst_QSqlQuery::sqlite_constraint()
{
- QFETCH( QString, dbName );
- QSqlDatabase db = QSqlDatabase::database( dbName );
- CHECK_DATABASE( db );
-
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType != QSqlDriver::SQLite)
- QSKIP("Sqlite3 specific test");
+ QFETCH(QString, dbName);
+ QSqlDatabase db = QSqlDatabase::database(dbName);
+ CHECK_DATABASE(db);
+ if (tst_Databases::getDatabaseType(db) != QSqlDriver::SQLite)
+ QSKIP("SQLite3-specific test");
QSqlQuery q(db);
const QString trigger(qTableName("test_constraint", __FILE__, db));
- QVERIFY_SQL(q, exec("CREATE TEMP TRIGGER "+trigger+" BEFORE DELETE ON "+qtest+
- "\nFOR EACH ROW "
- "\nBEGIN"
- "\n SELECT RAISE(ABORT, 'Raised Abort successfully');"
- "\nEND;"
- ));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TEMP TRIGGER %1 BEFORE DELETE ON %2\n"
+ "FOR EACH ROW\n"
+ "BEGIN\n"
+ " SELECT RAISE(ABORT, 'Raised Abort successfully');\n"
+ "END;").arg(trigger, qtest)));
- QVERIFY(!q.exec("DELETE FROM "+qtest));
+ QVERIFY(!q.exec("DELETE FROM " + qtest));
QCOMPARE(q.lastError().databaseText(), QLatin1String("Raised Abort successfully"));
}
@@ -4405,23 +4420,25 @@ void tst_QSqlQuery::sqlite_real()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
const QString tableName(qTableName("sqliterealtype", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INTEGER, realVal REAL)"));
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id, realVal) VALUES (1, 2.3)"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id INTEGER, realVal REAL)")
+ .arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id, realVal) VALUES (1, 2.3)")
+ .arg(tableName)));
QVERIFY_SQL(q, exec("SELECT realVal FROM " + tableName));
QVERIFY(q.next());
QCOMPARE(q.value(0).toDouble(), 2.3);
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Double);
- q.prepare("INSERT INTO " + tableName + " (id, realVal) VALUES (?, ?)");
+ q.prepare(QLatin1String("INSERT INTO %1 (id, realVal) VALUES (?, ?)").arg(tableName));
QVariant var((double)5.6);
q.addBindValue(4);
q.addBindValue(var);
QVERIFY_SQL(q, exec());
- QVERIFY_SQL(q, exec("SELECT realVal FROM " + tableName + " WHERE ID=4"));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT realVal FROM %1 WHERE ID=4").arg(tableName)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toDouble(), 5.6);
}
@@ -4446,10 +4463,10 @@ void tst_QSqlQuery::aggregateFunctionTypes()
}
{
const QString tableName(qTableName("numericFunctionsWithIntValues", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INTEGER)"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id INTEGER)").arg(tableName)));
// First test without any entries
QVERIFY_SQL(q, exec("SELECT SUM(id) FROM " + tableName));
@@ -4459,8 +4476,8 @@ void tst_QSqlQuery::aggregateFunctionTypes()
else
QCOMPARE(q.record().field(0).metaType().id(), sumType);
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (1)"));
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (2)"));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (1)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (2)").arg(tableName)));
QVERIFY_SQL(q, exec("SELECT SUM(id) FROM " + tableName));
QVERIFY(q.next());
@@ -4469,13 +4486,14 @@ void tst_QSqlQuery::aggregateFunctionTypes()
QVERIFY_SQL(q, exec("SELECT AVG(id) FROM " + tableName));
QVERIFY(q.next());
- if (dbType == QSqlDriver::SQLite || dbType == QSqlDriver::PostgreSQL || dbType == QSqlDriver::MySqlServer
- || dbType == QSqlDriver::Oracle) {
+ if (dbType == QSqlDriver::SQLite || dbType == QSqlDriver::PostgreSQL
+ || dbType == QSqlDriver::MySqlServer || dbType == QSqlDriver::Oracle) {
QCOMPARE(q.value(0).toDouble(), 1.5);
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Double);
} else {
QCOMPARE(q.value(0).toInt(), 1);
- QCOMPARE(q.record().field(0).metaType().id(), (dbType == QSqlDriver::Interbase ? QMetaType::LongLong : QMetaType::Int));
+ QCOMPARE(q.record().field(0).metaType().id(),
+ dbType == QSqlDriver::Interbase ? QMetaType::LongLong : QMetaType::Int);
}
QVERIFY_SQL(q, exec("SELECT COUNT(id) FROM " + tableName));
@@ -4495,10 +4513,10 @@ void tst_QSqlQuery::aggregateFunctionTypes()
}
{
const QString tableName(qTableName("numericFunctionsWithDoubleValues", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id REAL)"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id REAL)").arg(tableName)));
// First test without any entries
QVERIFY_SQL(q, exec("SELECT SUM(id) FROM " + tableName));
@@ -4508,8 +4526,8 @@ void tst_QSqlQuery::aggregateFunctionTypes()
else
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Double);
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (1.5)"));
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (2.5)"));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (1.5)").arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (2.5)").arg(tableName)));
QVERIFY_SQL(q, exec("SELECT SUM(id) FROM " + tableName));
QVERIFY(q.next());
@@ -4539,16 +4557,17 @@ void tst_QSqlQuery::aggregateFunctionTypes()
QString field = "id";
// PSQL does not have the round() function with real type
- if (dbType == QSqlDriver::PostgreSQL) {
+ if (dbType == QSqlDriver::PostgreSQL)
field += "::NUMERIC";
- }
- QVERIFY_SQL(q, exec("SELECT ROUND(" + field + ", 1) FROM " + tableName + " WHERE id=1.5"));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT ROUND(%1, 1) FROM %2 WHERE id=1.5")
+ .arg(field, tableName)));
QVERIFY(q.next());
QCOMPARE(q.value(0).toDouble(), 1.5);
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::Double);
- QVERIFY_SQL(q, exec("SELECT ROUND(" + field + ", 0) FROM " + tableName + " WHERE id=2.5"));
+ QVERIFY_SQL(q, exec(QLatin1String("SELECT ROUND(%1, 0) FROM %2 WHERE id=2.5")
+ .arg(field, tableName)));
QVERIFY(q.next());
if (dbType == QSqlDriver::MySqlServer)
QCOMPARE(q.value(0).toDouble(), 2.0);
@@ -4558,10 +4577,11 @@ void tst_QSqlQuery::aggregateFunctionTypes()
}
{
const QString tableName(qTableName("stringFunctions", __FILE__, db));
- tst_Databases::safeDropTable( db, tableName );
+ tst_Databases::safeDropTable(db, tableName);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INTEGER, txt VARCHAR(50))"));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %1 (id INTEGER, txt VARCHAR(50))")
+ .arg(tableName)));
QVERIFY_SQL(q, exec("SELECT MAX(txt) FROM " + tableName));
QVERIFY(q.next());
@@ -4570,8 +4590,10 @@ void tst_QSqlQuery::aggregateFunctionTypes()
else
QCOMPARE(q.record().field(0).metaType().id(), QMetaType::QString);
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id, txt) VALUES (1, 'lower')"));
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id, txt) VALUES (2, 'upper')"));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id, txt) VALUES (1, 'lower')")
+ .arg(tableName)));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id, txt) VALUES (2, 'upper')")
+ .arg(tableName)));
QVERIFY_SQL(q, exec("SELECT MAX(txt) FROM " + tableName));
QVERIFY(q.next());
@@ -4589,10 +4611,10 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName, const
QSqlQuery q(db);
QVERIFY_SQL(q, exec("DROP TABLE IF EXISTS " + tableName));
- QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id " + type + ')'));
+ QVERIFY_SQL(q, exec(QLatin1String("CREATE TABLE %2 (id %1)").arg(type, tableName)));
if (withPreparedStatement) {
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (id) VALUES (?)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 (id) VALUES (?)").arg(tableName)));
}
for (int i = 0; i < values.size(); ++i) {
const T v = values.at(i);
@@ -4600,12 +4622,13 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName, const
q.bindValue(0, v);
QVERIFY_SQL(q, exec());
} else {
- QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id) VALUES (" + QString::number(v) + QLatin1Char(')')));
+ QVERIFY_SQL(q, exec(QLatin1String("INSERT INTO %1 (id) VALUES (%2)")
+ .arg(tableName, QString::number(v))));
}
variantValues.append(QVariant::fromValue(v));
}
- // ensure we can read them back properly
+ // Ensure we can read them back properly:
if (withPreparedStatement) {
QVERIFY_SQL(q, prepare("SELECT id FROM " + tableName));
QVERIFY_SQL(q, exec());
@@ -4633,8 +4656,8 @@ void runIntegralTypesMysqlTest(QSqlDatabase &db, const QString &tableName,
const T min = std::numeric_limits<T>::min(),
const T max = std::numeric_limits<T>::max())
{
- // insert some values
- const int steps = 20;
+ // Insert some values:
+ constexpr int steps = 20;
const T increment = (max / steps - min / steps);
QList<T> values;
values.reserve(steps);
@@ -4653,26 +4676,35 @@ void tst_QSqlQuery::integralTypesMysql()
const QList<bool> boolValues = QList<bool>() << false << true;
for (int i = 0; i < 2; ++i) {
const bool withPreparedStatement = (i == 1);
- runIntegralTypesMysqlTest<bool>(db, "tinyInt1Test", "TINYINT(1)", withPreparedStatement, boolValues);
- runIntegralTypesMysqlTest<bool>(db, "unsignedTinyInt1Test", "TINYINT(1) UNSIGNED", withPreparedStatement, boolValues);
+ runIntegralTypesMysqlTest<bool>(db, "tinyInt1Test", "TINYINT(1)",
+ withPreparedStatement, boolValues);
+ runIntegralTypesMysqlTest<bool>(db, "unsignedTinyInt1Test", "TINYINT(1) UNSIGNED",
+ withPreparedStatement, boolValues);
runIntegralTypesMysqlTest<qint8>(db, "tinyIntTest", "TINYINT", withPreparedStatement);
- runIntegralTypesMysqlTest<quint8>(db, "unsignedTinyIntTest", "TINYINT UNSIGNED", withPreparedStatement);
+ runIntegralTypesMysqlTest<quint8>(db, "unsignedTinyIntTest", "TINYINT UNSIGNED",
+ withPreparedStatement);
runIntegralTypesMysqlTest<qint16>(db, "smallIntTest", "SMALLINT", withPreparedStatement);
- runIntegralTypesMysqlTest<quint16>(db, "unsignedSmallIntTest", "SMALLINT UNSIGNED", withPreparedStatement);
- runIntegralTypesMysqlTest<qint32>(db, "mediumIntTest", "MEDIUMINT", withPreparedStatement, -(1 << 23), (1 << 23) - 1);
- runIntegralTypesMysqlTest<quint32>(db, "unsignedMediumIntTest", "MEDIUMINT UNSIGNED", withPreparedStatement, 0, (1 << 24) - 1);
+ runIntegralTypesMysqlTest<quint16>(db, "unsignedSmallIntTest", "SMALLINT UNSIGNED",
+ withPreparedStatement);
+ runIntegralTypesMysqlTest<qint32>(db, "mediumIntTest", "MEDIUMINT", withPreparedStatement,
+ -(1 << 23), (1 << 23) - 1);
+ runIntegralTypesMysqlTest<quint32>(db, "unsignedMediumIntTest", "MEDIUMINT UNSIGNED",
+ withPreparedStatement, 0, (1 << 24) - 1);
runIntegralTypesMysqlTest<qint32>(db, "intTest", "INT", withPreparedStatement);
- runIntegralTypesMysqlTest<quint32>(db, "unsignedIntTest", "INT UNSIGNED", withPreparedStatement);
+ runIntegralTypesMysqlTest<quint32>(db, "unsignedIntTest", "INT UNSIGNED",
+ withPreparedStatement);
runIntegralTypesMysqlTest<qint64>(db, "bigIntTest", "BIGINT", withPreparedStatement);
- runIntegralTypesMysqlTest<quint64>(db, "unsignedBigIntTest", "BIGINT UNSIGNED", withPreparedStatement);
+ runIntegralTypesMysqlTest<quint64>(db, "unsignedBigIntTest", "BIGINT UNSIGNED",
+ withPreparedStatement);
}
}
void tst_QSqlQuery::QTBUG_57138()
{
- 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);
- QDateTime tzoffset = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::OffsetFromUTC, 3600);
+ const QDateTime utc = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::UTC);
+ const QDateTime localtime = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123), Qt::LocalTime);
+ const QDateTime tzoffset = QDateTime(QDate(2150, 1, 5), QTime(14, 0, 0, 123),
+ Qt::OffsetFromUTC, 3600);
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
@@ -4682,18 +4714,21 @@ void tst_QSqlQuery::QTBUG_57138()
QString tableName = qTableName("qtbug57138", __FILE__, db);
tst_Databases::safeDropTable(db, tableName);
- QVERIFY_SQL(create, exec("create table " + tableName + " (id int, dt_utc datetime, dt_lt datetime, dt_tzoffset datetime)"));
- QVERIFY_SQL(create, prepare("insert into " + tableName + " (id, dt_utc, dt_lt, dt_tzoffset) values (?, ?, ?, ?)"));
+ QVERIFY_SQL(create, exec(QLatin1String(
+ "create table %1 (id int, dt_utc datetime, dt_lt datetime, "
+ "dt_tzoffset datetime)").arg(tableName)));
+ QVERIFY_SQL(create, prepare(QLatin1String("insert into %1 (id, dt_utc, dt_lt, dt_tzoffset) "
+ "values (?, ?, ?, ?)").arg(tableName)));
create.addBindValue(0);
create.addBindValue(utc);
create.addBindValue(localtime);
create.addBindValue(tzoffset);
-
QVERIFY_SQL(create, exec());
QSqlQuery q(db);
- q.prepare("SELECT dt_utc, dt_lt, dt_tzoffset FROM " + tableName + " WHERE id = ?");
+ q.prepare(QLatin1String("SELECT dt_utc, dt_lt, dt_tzoffset FROM %1 WHERE id = ?")
+ .arg(tableName));
q.addBindValue(0);
QVERIFY_SQL(q, exec());
@@ -4714,8 +4749,12 @@ void tst_QSqlQuery::QTBUG_73286()
QString tableName = qTableName("qtbug73286", __FILE__, db);
tst_Databases::safeDropTable(db, tableName);
- QVERIFY_SQL(create, exec("create table " + tableName + " (dec2 decimal(4,2), dec0 decimal(20,0), dec3 decimal(20,3))"));
- QVERIFY_SQL(create, prepare("insert into " + tableName + " (dec2, dec0, dec3) values (?, ?, ?)"));
+ QVERIFY_SQL(create, exec(QLatin1String(
+ "create table %1 (dec2 decimal(4,2), dec0 decimal(20,0), "
+ "dec3 decimal(20,3))").arg(tableName)));
+ QVERIFY_SQL(create, prepare(QLatin1String(
+ "insert into %1 (dec2, dec0, dec3) values (?, ?, ?)")
+ .arg(tableName)));
create.addBindValue("99.99");
create.addBindValue("12345678901234567890");
@@ -4738,7 +4777,7 @@ void tst_QSqlQuery::QTBUG_73286()
void tst_QSqlQuery::dateTime_data()
{
if (dbs.dbNames.isEmpty())
- QSKIP( "No database drivers are available in this Qt configuration");
+ QSKIP("No database drivers are available in this Qt configuration");
QTest::addColumn<QString>("dbName");
QTest::addColumn<QString>("tableName");
@@ -4747,8 +4786,8 @@ void tst_QSqlQuery::dateTime_data()
QTest::addColumn<QList<QDateTime> >("expectedDateTimes");
#if QT_CONFIG(timezone)
- // Using time zones which are highly unlikely to be the same as the testing machine's one
- // as it could pass as a result despite it.
+ // Using time zones which are highly unlikely to be the same as the testing
+ // machine's one as it could pass as a result despite it.
// +8.5 hours from UTC to North Korea
const QTimeZone afterUTCTimeZone(30600);
// -8 hours from UTC to Belize
@@ -4791,22 +4830,23 @@ void tst_QSqlQuery::dateTime_data()
if (!db.isValid())
continue;
const QString tableNameTSWithTimeZone(qTableName("dateTimeTSWithTimeZone", __FILE__, db));
- const QString tableNameTSWithLocalTimeZone(qTableName("dateTimeTSWithLocalTimeZone", __FILE__, db));
+ const QString tableNameTSWithLocalTimeZone(qTableName("dateTimeTSWithLocalTimeZone",
+ __FILE__, db));
const QString tableNameTS(qTableName("dateTimeTS", __FILE__, db));
const QString tableNameDate(qTableName("dateTimeDate", __FILE__, db));
QTest::newRow(QString(dbName + " timestamp with time zone").toLatin1())
<< dbName << tableNameTSWithTimeZone
- << QStringLiteral(" (dt TIMESTAMP WITH TIME ZONE)")
+ << u" (dt TIMESTAMP WITH TIME ZONE)"_s
<< dateTimes << dateTimes;
QTest::newRow(QString(dbName + " timestamp with local time zone").toLatin1())
<< dbName << tableNameTSWithTimeZone
- << QStringLiteral(" (dt TIMESTAMP WITH LOCAL TIME ZONE)")
+ << u" (dt TIMESTAMP WITH LOCAL TIME ZONE)"_s
<< dateTimes << expectedDateTimesLocalTZ;
QTest::newRow(QString(dbName + "timestamp").toLatin1())
- << dbName << tableNameTS << QStringLiteral(" (dt TIMESTAMP(3))")
+ << dbName << tableNameTS << u" (dt TIMESTAMP(3))"_s
<< dateTimes << expectedTimeStampDateTimes;
QTest::newRow(QString(dbName + "date").toLatin1())
- << dbName << tableNameDate << QStringLiteral(" (dt DATE)")
+ << dbName << tableNameDate << u" (dt DATE)"_s
<< dateTimes << expectedDateTimes;
}
}
@@ -4816,9 +4856,7 @@ void tst_QSqlQuery::dateTime()
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
-
- QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
- if (dbType != QSqlDriver::Oracle)
+ if (tst_Databases::getDatabaseType(db) != QSqlDriver::Oracle)
QSKIP("Implemented only for Oracle");
QFETCH(QString, tableName);
@@ -4831,7 +4869,7 @@ void tst_QSqlQuery::dateTime()
QSqlQuery q(db);
QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + createTableString));
for (const QDateTime &dt : qAsConst(initialDateTimes)) {
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " values(:dt)"));
+ QVERIFY_SQL(q, prepare(QLatin1String("INSERT INTO %1 values(:dt)").arg(tableName)));
q.bindValue(":dt", dt);
QVERIFY_SQL(q, exec());
}
@@ -4851,14 +4889,17 @@ void tst_QSqlQuery::sqliteVirtualTable()
CHECK_DATABASE(db);
const auto tableName = qTableName("sqliteVirtual", __FILE__, db);
QSqlQuery qry(db);
- QVERIFY_SQL(qry, exec("create virtual table " + tableName + " using fts3(id, name)"));
+ QVERIFY_SQL(qry, exec(QLatin1String("create virtual table %1 using fts3(id, name)")
+ .arg(tableName)));
// Delibrately malform the query to try and provoke a potential crash situation
- QVERIFY_SQL(qry, prepare("select * from " + tableName + " where name match '?'"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("select * from %1 where name match '?'")
+ .arg(tableName)));
qry.addBindValue("Andy");
QVERIFY(!qry.exec());
- QVERIFY_SQL(qry, prepare("insert into " + tableName + "(id, name) VALUES (?, ?)"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("insert into %1(id, name) VALUES (?, ?)")
+ .arg(tableName)));
qry.addBindValue(1);
qry.addBindValue("Andy");
QVERIFY_SQL(qry, exec());
@@ -4868,12 +4909,13 @@ void tst_QSqlQuery::sqliteVirtualTable()
QCOMPARE(qry.value(0).toInt(), 1);
QCOMPARE(qry.value(1).toString(), "Andy");
- QVERIFY_SQL(qry, prepare("insert into " + tableName + "(id, name) values (:id, :name)"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("insert into %1(id, name) values (:id, :name)")
+ .arg(tableName)));
qry.bindValue(":id", 2);
qry.bindValue(":name", "Peter");
QVERIFY_SQL(qry, exec());
- QVERIFY_SQL(qry, prepare("select * from " + tableName + " where name match ?"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("select * from %1 where name match ?").arg(tableName)));
qry.addBindValue("Peter");
QVERIFY_SQL(qry, exec());
QVERIFY(qry.next());
@@ -4891,26 +4933,33 @@ void tst_QSqlQuery::mysql_timeType()
const auto tableName = qTableName("mysqlTimeType", __FILE__, db);
tst_Databases::safeDropTables(db, { tableName });
QSqlQuery qry(db);
- QVERIFY_SQL(qry, exec("create table " + tableName + " (t time(6))"));
+ QVERIFY_SQL(qry, exec(QLatin1String("create table %1 (t time(6))").arg(tableName)));
// MySQL will convert days into hours and add them together so 17 days 11 hours becomes 419 hours
- const QStringList timeData = { "-838:59:59.000000", "-123:45:56.789", "000:00:00.0", "123:45:56.789",
- "838:59:59.000000", "15:50", "12", "1213", "0 1:2:3", "17 11:22:33" };
- const QStringList resultTimeData = { "-838:59:59.000000", "-123:45:56.789000", "00:00:00.000000",
- "123:45:56.789000", "838:59:59.000000", "15:50:00.000000", "00:00:12.000000", "00:12:13.000000",
- "01:02:03.000000", "419:22:33.000000" };
- for (const QString &time : timeData)
- QVERIFY_SQL(qry, exec("insert into " + tableName + " (t) VALUES ('" + time + "')"));
+ const QString timeData[] = {
+ u"-838:59:59.000000"_s, u"-123:45:56.789"_s, u"000:00:00.0"_s, u"123:45:56.789"_s,
+ u"838:59:59.000000"_s, u"15:50"_s, u"12"_s, u"1213"_s, u"0 1:2:3"_s, u"17 11:22:33"_s
+ };
+ const QString resultTimeData[] = {
+ u"-838:59:59.000000"_s, u"-123:45:56.789000"_s, u"00:00:00.000000"_s,
+ u"123:45:56.789000"_s, u"838:59:59.000000"_s, u"15:50:00.000000"_s,
+ u"00:00:12.000000"_s, u"00:12:13.000000"_s, u"01:02:03.000000"_s, u"419:22:33.000000"_s
+ };
+ for (const QString &time : timeData) {
+ QVERIFY_SQL(qry, exec(QLatin1String("insert into %2 (t) VALUES ('%1')")
+ .arg(time, tableName)));
+ }
QVERIFY_SQL(qry, exec("select * from " + tableName));
- for (const QString &time : qAsConst(resultTimeData)) {
+ for (const QString &time : resultTimeData) {
QVERIFY(qry.next());
QCOMPARE(qry.value(0).toString(), time);
}
QVERIFY_SQL(qry, exec("delete from " + tableName));
for (const QString &time : timeData) {
- QVERIFY_SQL(qry, prepare("insert into " + tableName + " (t) VALUES (:time)"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("insert into %1 (t) VALUES (:time)")
+ .arg(tableName)));
qry.bindValue(0, time);
QVERIFY_SQL(qry, exec());
}
@@ -4921,9 +4970,12 @@ void tst_QSqlQuery::mysql_timeType()
}
QVERIFY_SQL(qry, exec("delete from " + tableName));
- const QList<QTime> qTimeBasedData = { QTime(), QTime(1, 2, 3, 4), QTime(0, 0, 0, 0), QTime(23,59,59,999) };
+ const QTime qTimeBasedData[] = {
+ QTime(), QTime(1, 2, 3, 4), QTime(0, 0, 0, 0), QTime(23, 59, 59, 999)
+ };
for (const QTime &time : qTimeBasedData) {
- QVERIFY_SQL(qry, prepare("insert into " + tableName + " (t) VALUES (:time)"));
+ QVERIFY_SQL(qry, prepare(QLatin1String("insert into %1 (t) VALUES (:time)")
+ .arg(tableName)));
qry.bindValue(0, time);
QVERIFY_SQL(qry, exec());
}
@@ -4943,10 +4995,11 @@ void tst_QSqlQuery::ibaseArray()
const auto arrayTable = qTableName("ibasearray", __FILE__, db);
tst_Databases::safeDropTable(db, arrayTable);
QSqlQuery qry(db);
- QVERIFY_SQL(qry, exec("create table " + arrayTable + " (intData int[0:4], longData bigint[5], "
- "charData varchar(255)[5], boolData boolean[2])"));
- QVERIFY_SQL(qry, prepare("insert into " + arrayTable + " (intData, longData, charData, boolData) "
- "values(?, ?, ?, ?)"));
+ QVERIFY_SQL(qry, exec(QLatin1String(
+ "create table %1 (intData int[0:4], longData bigint[5], "
+ "charData varchar(255)[5], boolData boolean[2])").arg(arrayTable)));
+ QVERIFY_SQL(qry, prepare(QLatin1String("insert into %1 (intData, longData, charData, boolData)"
+ " values(?, ?, ?, ?)").arg(arrayTable)));
const auto intArray = QVariant{QVariantList{1, 2, 3, 4711, 815}};
const auto charArray = QVariant{QVariantList{"AAA", "BBB", "CCC", "DDD", "EEE"}};
const auto boolArray = QVariant{QVariantList{true, false}};
@@ -4983,5 +5036,5 @@ void tst_QSqlQuery::ibase_executeBlock()
QCOMPARE(qry.value(0).toInt(), 4);
}
-QTEST_MAIN( tst_QSqlQuery )
+QTEST_MAIN(tst_QSqlQuery)
#include "tst_qsqlquery.moc"
diff --git a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
index ac71e0edc2..478dec6ac4 100644
--- a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
index d9c5a411ba..79be0dc230 100644
--- a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
+++ b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef TESTSQLDRIVER_H
#define TESTSQLDRIVER_H
diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
index cae8491b81..b8fd27bc50 100644
--- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
+++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
#include <QtSql/QtSql>
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 163e433bd1..d868cf0197 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index ce65dcf674..8b7476b3e7 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
index f0a8006b79..5c49600b8f 100644
--- a/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
+++ b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 89d975422a..4f824cce66 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index a83cb37605..ebddefb5fd 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <QTest>