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

QSqlDatabase: deprecate QSqlDatabase::exec()

Browse Source 
The note that QSqlDatabase::exec() is deprecated was added more than 12
years ago so it's time to also mark the function as such.

Change-Id: Ic5e7c31b3ff5b21e16e2640548cba1a4baaeeb1c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2023-02-13 20:33:27 +01:00
parent 386dcbf6b9
commit 12909d7c3d
5 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/kernel/qsqldatabase.cpp
View File

@ -389,9 +389,6 @@ void QSqlDatabasePrivate::disable()
\li registers a custom-made driver \li registers a custom-made driver
\endtable \endtable
\note QSqlDatabase::exec() is deprecated. Use QSqlQuery::exec()
instead.
\note When using transactions, you must start the \note When using transactions, you must start the
transaction before you create your query. transaction before you create your query.
@ -692,8 +689,9 @@ QSqlDatabase::~QSqlDatabase()
lastError() is not affected. lastError() is not affected.
\sa QSqlQuery, lastError() \sa QSqlQuery, lastError()
\deprecated [6.6] Use QSqlQuery::exec() instead.
*/ */
#if QT_DEPRECATED_SINCE(6, 6)
QSqlQuery QSqlDatabase::exec(const QString & query) const QSqlQuery QSqlDatabase::exec(const QString & query) const
{ {
QSqlQuery r(d->driver->createResult()); QSqlQuery r(d->driver->createResult());
@ -703,6 +701,7 @@ QSqlQuery QSqlDatabase::exec(const QString & query) const
} }
return r; return r;
} }
#endif
/*! /*!
Opens the database connection using the current connection Opens the database connection using the current connection

3
src/sql/kernel/qsqldatabase.h
View File

@ -48,7 +48,10 @@ public:
QStringList tables(QSql::TableType type = QSql::Tables) const; QStringList tables(QSql::TableType type = QSql::Tables) const;
QSqlIndex primaryIndex(const QString& tablename) const; QSqlIndex primaryIndex(const QString& tablename) const;
QSqlRecord record(const QString& tablename) const; QSqlRecord record(const QString& tablename) const;
#if QT_DEPRECATED_SINCE(6, 6)
QT_DEPRECATED_VERSION_X_6_6("QSqlQuery::exec() instead.")
QSqlQuery exec(const QString& query = QString()) const; QSqlQuery exec(const QString& query = QString()) const;
#endif
QSqlError lastError() const; QSqlError lastError() const;
bool isValid() const; bool isValid() const;

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

@ -375,11 +375,15 @@ void tst_QSqlQuery::dropTestTables(QSqlDatabase db)
if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Oracle) if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Oracle)
tablenames << qTableName("qtest_longstr", __FILE__, db); tablenames << qTableName("qtest_longstr", __FILE__, db);
if (dbType == QSqlDriver::MSSqlServer) if (dbType == QSqlDriver::MSSqlServer) {
db.exec("DROP PROCEDURE " + qTableName("test141895_proc", __FILE__, db)); QSqlQuery q(db);
q.exec("DROP PROCEDURE " + qTableName("test141895_proc", __FILE__, db));
}
if (dbType == QSqlDriver::MySqlServer) if (dbType == QSqlDriver::MySqlServer) {
db.exec("DROP PROCEDURE IF EXISTS " + qTableName("bug6852_proc", __FILE__, db)); QSqlQuery q(db);
q.exec("DROP PROCEDURE IF EXISTS " + qTableName("bug6852_proc", __FILE__, db));
}
tst_Databases::safeDropTables(db, tablenames); tst_Databases::safeDropTables(db, tablenames);

9
tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp
View File

@ -79,14 +79,15 @@ void tst_QSqlRelationalDelegate::initTestCase()
{ {
foreach (const QString &dbname, dbs.dbNames) { foreach (const QString &dbname, dbs.dbNames) {
QSqlDatabase db = QSqlDatabase::database(dbname); QSqlDatabase db = QSqlDatabase::database(dbname);
QSqlQuery q(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::Interbase) { if (dbType == QSqlDriver::Interbase) {
db.exec("SET DIALECT 3"); q.exec("SET DIALECT 3");
} else if (dbType == QSqlDriver::MSSqlServer) { } else if (dbType == QSqlDriver::MSSqlServer) {
db.exec("SET ANSI_DEFAULTS ON"); q.exec("SET ANSI_DEFAULTS ON");
db.exec("SET IMPLICIT_TRANSACTIONS OFF"); q.exec("SET IMPLICIT_TRANSACTIONS OFF");
} else if (dbType == QSqlDriver::PostgreSQL) { } else if (dbType == QSqlDriver::PostgreSQL) {
db.exec("set client_min_messages='warning'"); q.exec("set client_min_messages='warning'");
} }
recreateTestTables(db); recreateTestTables(db);
} }

14
tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -135,14 +135,15 @@ void tst_QSqlRelationalTableModel::initTestCase()
{ {
foreach (const QString &dbname, dbs.dbNames) { foreach (const QString &dbname, dbs.dbNames) {
QSqlDatabase db = QSqlDatabase::database(dbname); QSqlDatabase db = QSqlDatabase::database(dbname);
QSqlQuery q(db);
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::Interbase) { if (dbType == QSqlDriver::Interbase) {
db.exec("SET DIALECT 3"); q.exec("SET DIALECT 3");
} else if (dbType == QSqlDriver::MSSqlServer) { } else if (dbType == QSqlDriver::MSSqlServer) {
db.exec("SET ANSI_DEFAULTS ON"); q.exec("SET ANSI_DEFAULTS ON");
db.exec("SET IMPLICIT_TRANSACTIONS OFF"); q.exec("SET IMPLICIT_TRANSACTIONS OFF");
} else if (dbType == QSqlDriver::PostgreSQL) { } else if (dbType == QSqlDriver::PostgreSQL) {
db.exec("set client_min_messages='warning'"); q.exec("set client_min_messages='warning'");
} }
recreateTestTables(db); recreateTestTables(db);
} }
@ -167,8 +168,9 @@ void tst_QSqlRelationalTableModel::dropTestTables( QSqlDatabase db )
qTableName("casetest1", __FILE__, db)}; qTableName("casetest1", __FILE__, db)};
tst_Databases::safeDropTables( db, tableNames ); tst_Databases::safeDropTables( db, tableNames );
db.exec("DROP SCHEMA " + qTableName("QTBUG_5373", __FILE__, db) + " CASCADE"); QSqlQuery q(db);
db.exec("DROP SCHEMA " + qTableName("QTBUG_5373_s2", __FILE__, db) + " CASCADE"); q.exec("DROP SCHEMA " + qTableName("QTBUG_5373", __FILE__, db) + " CASCADE");
q.exec("DROP SCHEMA " + qTableName("QTBUG_5373_s2", __FILE__, db) + " CASCADE");
} }
void tst_QSqlRelationalTableModel::init() void tst_QSqlRelationalTableModel::init()