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

QtSql: remove compat SQL plugin names

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2020-01-31 22:16:35 +01:00
parent 60feaae196
commit 8471d267f1
14 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
View File

@ -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);

1
src/plugins/sqldrivers/mysql/main.cpp
View File

@ -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;

2
src/plugins/sqldrivers/mysql/mysql.json
View File

@ -1,3 +1,3 @@
{
"Keys": [ "QMYSQL3", "QMYSQL", "QMARIADB" ]
"Keys": [ "QMYSQL", "QMARIADB" ]
}

2
src/plugins/sqldrivers/mysql/qsql_mysql.cpp
View File

@ -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)));
}

2
src/plugins/sqldrivers/oci/main.cpp
View File

@ -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;
}

2
src/plugins/sqldrivers/oci/oci.json
View File

@ -1,3 +1,3 @@
{
"Keys": [ "QOCI8", "QOCI" ]
"Keys": [ "QOCI" ]
}

2
src/plugins/sqldrivers/odbc/main.cpp
View File

@ -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;
}

2
src/plugins/sqldrivers/odbc/odbc.json
View File

@ -1,3 +1,3 @@
{
"Keys": [ "QODBC3", "QODBC" ]
"Keys": [ "QODBC" ]
}

4
src/plugins/sqldrivers/odbc/qsql_odbc.cpp
View File

@ -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());
}

2
src/plugins/sqldrivers/psql/main.cpp
View File

@ -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;
}

2
src/plugins/sqldrivers/psql/psql.json
View File

@ -1,3 +1,3 @@
{
"Keys": [ "QPSQL7", "QPSQL" ]
"Keys": [ "QPSQL" ]
}

2
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
View File

@ -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;"

2
src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
View File

@ -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]

2
tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
View File

@ -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);