From 8471d267f15e522836758953ab976beb21f42154 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 31 Jan 2020 22:16:35 +0100 Subject: 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 --- src/plugins/sqldrivers/mysql/main.cpp | 1 - src/plugins/sqldrivers/mysql/mysql.json | 2 +- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 +- src/plugins/sqldrivers/oci/main.cpp | 2 +- src/plugins/sqldrivers/oci/oci.json | 2 +- src/plugins/sqldrivers/odbc/main.cpp | 2 +- src/plugins/sqldrivers/odbc/odbc.json | 2 +- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 4 ++-- src/plugins/sqldrivers/psql/main.cpp | 2 +- src/plugins/sqldrivers/psql/psql.json | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src/plugins/sqldrivers') 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" ] } -- cgit v1.2.3