diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-01-31 22:16:35 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-02-13 22:42:26 +0100 |
commit | 8471d267f15e522836758953ab976beb21f42154 (patch) | |
tree | eea6cb2c60f5340fc744ebab0bc507665283f3a0 | |
parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) |
QtSql: remove compat SQL plugin names
Remove the compat SQL plugin names (QMYSQL3, QOCI8, QODBC3, QPSQL7)
since they are not needed and just confuse the user
[ChangeLog][QtSql] The compat plugin names QMYSQL3, QOCI8, QODBC3 and
QPSQL7 are no longer available.
Change-Id: I6d88f449ef3e18881a6970fb374ba0ab074ef302
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
-rw-r--r-- | examples/sql/sqlbrowser/qsqlconnectiondialog.cpp | 7 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/main.cpp | 1 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/mysql.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/oci.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/odbc.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/psql.json | 2 | ||||
-rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.cpp | 2 | ||||
-rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 2 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp | 2 |
14 files changed, 13 insertions, 21 deletions
diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp index 0d4a1bde77..482048ab98 100644 --- a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp +++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp @@ -60,13 +60,6 @@ QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent) QStringList drivers = QSqlDatabase::drivers(); - // remove compat names - drivers.removeAll("QMYSQL3"); - drivers.removeAll("QOCI8"); - drivers.removeAll("QODBC3"); - drivers.removeAll("QPSQL7"); - drivers.removeAll("QTDS7"); - if (!drivers.contains("QSQLITE")) ui.dbCheckBox->setEnabled(false); diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 4c6753097f..f7d56dd1c9 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -62,7 +62,6 @@ QMYSQLDriverPlugin::QMYSQLDriverPlugin() QSqlDriver* QMYSQLDriverPlugin::create(const QString &name) { if (name == QLatin1String("QMYSQL") || - name == QLatin1String("QMYSQL3") || name == QLatin1String("QMARIADB")) { QMYSQLDriver* driver = new QMYSQLDriver(); return driver; diff --git a/src/plugins/sqldrivers/mysql/mysql.json b/src/plugins/sqldrivers/mysql/mysql.json index 89f5e65fb9..8fd3d727b1 100644 --- a/src/plugins/sqldrivers/mysql/mysql.json +++ b/src/plugins/sqldrivers/mysql/mysql.json @@ -1,3 +1,3 @@ { - "Keys": [ "QMYSQL3", "QMYSQL", "QMARIADB" ] + "Keys": [ "QMYSQL", "QMARIADB" ] } diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 90a810d516..2930df7261 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -337,7 +337,7 @@ static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type, MYSQL_STMT* stmt) { const char *cerr = mysql_stmt_error(stmt); - return QSqlError(QLatin1String("QMYSQL3: ") + err, + return QSqlError(QLatin1String("QMYSQL: ") + err, QString::fromLatin1(cerr), type, QString::number(mysql_stmt_errno(stmt))); } diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp index e576928d31..db273bfb04 100644 --- a/src/plugins/sqldrivers/oci/main.cpp +++ b/src/plugins/sqldrivers/oci/main.cpp @@ -61,7 +61,7 @@ QOCIDriverPlugin::QOCIDriverPlugin() QSqlDriver* QOCIDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QOCI") || name == QLatin1String("QOCI8")) { + if (name == QLatin1String("QOCI")) { QOCIDriver* driver = new QOCIDriver(); return driver; } diff --git a/src/plugins/sqldrivers/oci/oci.json b/src/plugins/sqldrivers/oci/oci.json index cbed8fc1ac..c2bb8c81f6 100644 --- a/src/plugins/sqldrivers/oci/oci.json +++ b/src/plugins/sqldrivers/oci/oci.json @@ -1,3 +1,3 @@ { - "Keys": [ "QOCI8", "QOCI" ] + "Keys": [ "QOCI" ] } diff --git a/src/plugins/sqldrivers/odbc/main.cpp b/src/plugins/sqldrivers/odbc/main.cpp index ac63941a82..e712514a88 100644 --- a/src/plugins/sqldrivers/odbc/main.cpp +++ b/src/plugins/sqldrivers/odbc/main.cpp @@ -61,7 +61,7 @@ QODBCDriverPlugin::QODBCDriverPlugin() QSqlDriver* QODBCDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QODBC") || name == QLatin1String("QODBC3")) { + if (name == QLatin1String("QODBC")) { QODBCDriver* driver = new QODBCDriver(); return driver; } diff --git a/src/plugins/sqldrivers/odbc/odbc.json b/src/plugins/sqldrivers/odbc/odbc.json index 41640776fb..c3f6117f42 100644 --- a/src/plugins/sqldrivers/odbc/odbc.json +++ b/src/plugins/sqldrivers/odbc/odbc.json @@ -1,3 +1,3 @@ { - "Keys": [ "QODBC3", "QODBC" ] + "Keys": [ "QODBC" ] } diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 07bd08ca82..72b2133327 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -336,7 +336,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + return QSqlError(QLatin1String("QODBC: ") + err, message, type, nativeCode != -1 ? QString::number(nativeCode) : QString()); } @@ -345,7 +345,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, message, type, + return QSqlError(QLatin1String("QODBC: ") + err, message, type, nativeCode != -1 ? QString::number(nativeCode) : QString()); } diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index a0862a238a..c31e6f64b7 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -61,7 +61,7 @@ QPSQLDriverPlugin::QPSQLDriverPlugin() QSqlDriver* QPSQLDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QPSQL") || name == QLatin1String("QPSQL7")) + if (name == QLatin1String("QPSQL")) return new QPSQLDriver; return nullptr; } diff --git a/src/plugins/sqldrivers/psql/psql.json b/src/plugins/sqldrivers/psql/psql.json index 1579b99160..07092a33e7 100644 --- a/src/plugins/sqldrivers/psql/psql.json +++ b/src/plugins/sqldrivers/psql/psql.json @@ -1,3 +1,3 @@ { - "Keys": [ "QPSQL7", "QPSQL" ] + "Keys": [ "QPSQL" ] } diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp index 54576733bf..3757ba2eff 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp @@ -130,7 +130,7 @@ while (query1.next()) { //! [39] -QSqlDatabase db = QSqlDatabase::addDatabase("QODBC3"); +QSqlDatabase db = QSqlDatabase::addDatabase("QODBC"); QString connectString = QStringLiteral( "DRIVER=/path/to/installation/libodbcHDB.so;" "SERVERNODE=hostname:port;" diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc index c7cc06bca5..df4aa0fb34 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -220,7 +220,7 @@ make sub-oci //! [35] QSqlDatabase: QPSQL driver not loaded -QSqlDatabase: available drivers: QSQLITE QMYSQL QMYSQL3 QMARIADB QODBC QODBC3 QPSQL QPSQL7 +QSqlDatabase: available drivers: QSQLITE QMYSQL QMARIADB QODBC QPSQL Could not create database object //! [35] diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index 15190b0f3e..5fa5c1bb58 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -143,7 +143,7 @@ void tst_QSqlDriver::record() QCOMPARE(rec.count(), fields.size()); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); - // QTBUG-1363: QSqlField::length() always return -1 when using QODBC3 driver and QSqlDatabase::record() + // QTBUG-1363: QSqlField::length() always return -1 when using QODBC driver and QSqlDatabase::record() if (dbType == QSqlDriver::MSSqlServer && db.driverName().startsWith("QODBC")) QCOMPARE(rec.field(1).length(), 20); |