diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-01-31 22:02:03 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-02-07 20:22:44 +0100 |
commit | 947d1eaaa470c310351756caa506e35b5cd3c122 (patch) | |
tree | 153de9236c9b4f34b7d3479a7d23ef349ca65661 /src/sql | |
parent | e14e5e104d17d498378dc24645124900e8c419f4 (diff) |
QtSQL: remove SQLite2 and TDS driver for Qt6
They were deprecated in Qt4 (TDS) and 5.14 (SQLITE2) so they can be
removed now in Qt6
[ChangeLog][QtSql] Removed obsolete TDS and Sqlite2 drivers
Change-Id: I55118fb03106564d519a99ab55f9b5cf528179f3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 21 | ||||
-rw-r--r-- | src/sql/doc/src/qsqldatatype-table.qdoc | 63 | ||||
-rw-r--r-- | src/sql/doc/src/sql-driver.qdoc | 52 | ||||
-rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 17 |
4 files changed, 2 insertions, 151 deletions
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 b869b309b7..c7cc06bca5 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -54,7 +54,7 @@ Database options: -sql-<driver> ........ Enable SQL <driver> plugin. Supported drivers: - db2 ibase mysql oci odbc psql sqlite2 sqlite tds + db2 ibase mysql oci odbc psql sqlite [all auto] -sqlite .............. Select used sqlite3 [system/qt] @@ -146,21 +146,6 @@ nmake install //! [15] -//! [16] -cd $QTDIR/qtbase/src/plugins/sqldrivers -qmake -- TDS_PREFIX=$SYBASE -make sub-tds -//! [16] - - -//! [17] -cd %QTDIR%\qtbase\src\plugins\sqldrivers -qmake -nmake sub-tds -nmake install -//! [17] - - //! [18] cd $QTDIR/qtbase/src/plugins/sqldrivers qmake -- DB2_PREFIX=$DB2DIR @@ -271,8 +256,6 @@ Checking for MySQL... yes Checking for OCI (Oracle)... no Checking for ODBC... yes Checking for PostgreSQL... no -Checking for SQLite (version 2)... no -Checking for TDS (Sybase)... no Done running configuration tests. Configure summary: @@ -284,10 +267,8 @@ Qt Sql Drivers: OCI (Oracle) ........................... no ODBC ................................... yes PostgreSQL ............................. no - SQLite2 ................................ no SQLite ................................. yes Using system provided SQLite ......... no - TDS (Sybase) ........................... no Qt is now configured for building. Just run 'mingw32-make'. Once everything is built, you must run 'mingw32-make install'. diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc index aafbed6096..1c5ab741c9 100644 --- a/src/sql/doc/src/qsqldatatype-table.qdoc +++ b/src/sql/doc/src/qsqldatatype-table.qdoc @@ -502,67 +502,4 @@ \li The value is a BLOB of data, stored exactly as it was input. \li Mapped to QByteArray \endtable - - \section2 Sybase Adaptive Server Data Types - - \table 90% - \header - \li Sybase Adaptive Server data type - \li SQL type description - \li Recommended input (C++ or Qt data type) - \row - \li BINARY - \li Describes a fixed-length binary value up to 255 bytes in size. - \li Mapped to QByteArray - \row - \li CHAR - \li Character String - \li Mapped to QString - \row - \li DATETIME - \li Date and time. Range: 1753-01-01 00:00:00 through 9999-12-31 23:59:59. - \li Mapped to QDateTime - \row - \li NCHAR - \li Character String of fixed length - \li Mapped to QString - \row - \li NVARACHAR - \li Character String of variable length - \li Mapped to QString - \row - \li VARCHAR - \li Character String of fixed length - \li Mapped to QString - \row - \li CLOB - \li Character large string object - \li Mapped to QString - \row - \li TIMESTAMP - \li A unique number within a database - \li Mapped to QString - \row - \li SMALLDATETIME - \li Date and time. Range: 1900-01-01 00:00 through 2079-12-31 23:59 - \li Mapped to QDateTime - \row - \li UNICHAR - \li Character String of fixed length.(Unicode) - \li Mapped to QString - \row - \li UNIVARCHAR - \li Character String of variable length.(Unicode) - \li Mapped to QString - \row - \li VARBINARY - \li Describes a variable-length binary value up to 255 bytes in size - \li Mapped to QByteArray - \endtable - - \section2 SQLite Version 2 - - SQLite version 2 is "typeless". This means that you can store any kind of - data you want in any column of any table, regardless of the declared - data type of that column. We recommend that you map the data to QString. */ diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 4d6df63749..28841a58de 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -54,9 +54,7 @@ \li Open Database Connectivity (ODBC) - Microsoft SQL Server and other ODBC-compliant databases \row \li \l{#QPSQL}{QPSQL} \li PostgreSQL (versions 7.3 and above) - \row \li \l{#QSQLITE2}{QSQLITE2} \li SQLite version 2 \note obsolete since Qt 5.14 \row \li \l{#QSQLITE}{QSQLITE} \li SQLite version 3 - \row \li \l{#QTDS}{QTDS} \li Sybase Adaptive Server \note obsolete since Qt 4.7 \endtable SQLite is the in-process database system with the best test coverage @@ -500,49 +498,6 @@ in your installation package. It must be placed in the same folder as the application executable. - \target QTDS - \section2 QTDS for Sybase Adaptive Server - - \note TDS is no longer used by MS Sql Server, and is superseded by - \l{QODBC}{ODBC}. QTDS is obsolete from Qt 4.7. - - It is not possible to set the port with QSqlDatabase::setPort() due to limitations in the - Sybase client library. Refer to the Sybase documentation for information on how to set up - a Sybase client configuration file to enable connections to databases on non-default ports. - - \section3 How to Build the QTDS Plugin on Unix and \macos - - Under Unix, two libraries are available which support the TDS protocol: - - \list - \li FreeTDS, a free implementation of the TDS protocol - (\l{http://www.freetds.org}). - - \li Sybase Open Client, available from \l{https://support.sap.com}. - \endlist - - Regardless of which library you use, the shared object file - \c{libsybdb.so} is needed. Set the \c SYBASE environment variable to - point to the directory where you installed the client library and - execute \c{qmake}: - - \snippet code/doc_src_sql-driver.qdoc 16 - - \section3 How to Build the QDTS Plugin on Windows - - You can either use the DB-Library supplied by Microsoft or the Sybase - Open Client (\l{https://support.sap.com}). Configure will try to find - NTWDBLIB.LIB to build the plugin: - - \snippet code/doc_src_sql-driver.qdoc 17 - - By default, the Microsoft library is used on Windows. If you want to - force the use of the Sybase Open Client, you must define \c - Q_USE_SYBASE in \c{%QTDIR%\qtbase\src\plugins\sqldrivers\tds\qsql_tds.cpp}. - - If you are not using a Microsoft compiler, replace \c nmake - with \c mingw32-make in the line above. - \target QDB2 \section2 QDB2 for IBM DB2 (Version 7.1 and Above) @@ -571,13 +526,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c mingw32-make in the line above. - \target QSQLITE2 - \section2 QSQLITE2 for SQLite Version 2 - - The Qt SQLite 2 plugin is offered for compatibility. Whenever - possible, use the \l{#QSQLITE}{version 3 plugin} instead. The - build instructions for version 3 apply to version 2 as well. - \target QSQLITE \section2 QSQLITE for SQLite (Version 3 and Above) diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 32338c1fe2..094943ca31 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -619,8 +619,6 @@ QStringList QSqlDatabase::connectionNames() \row \li QODBC \li ODBC Driver (includes Microsoft SQL Server) \row \li QPSQL \li PostgreSQL Driver \row \li QSQLITE \li SQLite version 3 or above - \row \li QSQLITE2 \li SQLite version 2 - \row \li QTDS \li Sybase Adaptive Server \endtable Additional third party drivers, including your own custom @@ -1185,7 +1183,7 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li service \endlist - \header \li DB2 \li OCI \li TDS + \header \li DB2 \li OCI \row \li @@ -1200,9 +1198,6 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li OCI_ATTR_PREFETCH_MEMORY \endlist - \li - \e none - \header \li SQLite \li Interbase \row @@ -1327,11 +1322,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name) \li SQLHANDLE environment, SQLHANDLE connection \li \c qsql_db2.cpp \row - \li QTDS - \li QTDSDriver - \li LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName - \li \c qsql_tds.cpp - \row \li QSQLITE \li QSQLiteDriver \li sqlite *connection @@ -1343,11 +1333,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name) \li \c qsql_ibase.cpp \endtable - The host name (or service name) is needed when constructing the - QTDSDriver for creating new connections for internal queries. This - is to prevent blocking when several QSqlQuery objects are used - simultaneously. - \warning Adding a database connection with the same connection name as an existing connection, causes the existing connection to be replaced by the new one. |