diff options
Diffstat (limited to 'src/sql/doc/src')
| -rw-r--r-- | src/sql/doc/src/qsqldatatype-table.qdoc | 105 | ||||
| -rw-r--r-- | src/sql/doc/src/qt6-changes.qdoc | 2 | ||||
| -rw-r--r-- | src/sql/doc/src/sql-driver.qdoc | 41 | ||||
| -rw-r--r-- | src/sql/doc/src/sql-programming.qdoc | 4 |
4 files changed, 126 insertions, 26 deletions
diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc index 6eabf269c8..77aa56d21a 100644 --- a/src/sql/doc/src/qsqldatatype-table.qdoc +++ b/src/sql/doc/src/qsqldatatype-table.qdoc @@ -495,62 +495,80 @@ \li 32-bit signed integer \li typedef qint32 \row + \li INTEGER(n) + \li Integer with up to 45 digits precision + \li Mapped to QString + \row \li BIGINT \li 64-bit signed integer \li typedef qint64 \row \li REAL - \li 32-bit Single-precision floating point - \li typedef qreal + \li 32-bit Single-precision IEEE floating point + \li typedef float \row \li DOUBLE PRECISION - \li 64-bit Double-precision floating point + \li 64-bit Double-precision IEEE floating point \li Mapped to QString for high precision doubles, otherwise qreal \row \li FLOAT - \li 64-bit Double-precision floating point - \li typedef qreal + \li 64-bit Double-precision IEEE floating point + \li Mapped to QString for high precision doubles, otherwise qreal + \row + \li FLOAT(n) + \li Floating point with up to 45 digits precision + \li Mapped to QString + \row + \li DECIMAL(p,s) + \li Decimal with up to 45 digits precision and scale + \li Mapped to QString \row \li CHAR - \li Fixed-length, null-terminated character string + \li Fixed-length character Latin-1 string (CHAR or character) \li Mapped to QString \row \li VARCHAR - \li Null-terminated varying length string + \li Variable length Latin-1 string (VARCHAR or CHARACTER VARYING) \li Mapped to QString \row \li NCHAR - \li Fixed-length, null-terminated Unicode character string + \li Fixed-length Unicode string (NCHAR or NATIONAL CHARACTER) \li Mapped to QString \row \li NVARCHAR - \li Null-terminated varying length Unicode string + \li Variable length Unicode string (NVARCHAR or NATIONAL CHARACTER VARYING) \li Mapped to QString \row + \li BINARY + \li Fixed length binary data + \li Mapped to QByteArray + \row + \li VARBINARY + \li Variable length binary data (VARBINARY or BINARY VARYING) + \li Mapped to QByteArray + \row \li BLOB - \li Not null-terminated varying binary string with 4-byte string - length indicator + \li Binary large object (BLOB or BINARY LARGE OBJECT) \li Mapped to QByteArray \row \li CLOB - \li Character large string object + \li Latin-1 character large object (CLOB or CHARACTER LARGE OBJECT) \li Mapped to QString \row \li NCLOB - \li National Character large string object + \li Unicode character large object (NCLOB or NATIONAL CHARACTER LARGE OBJECT) \li Mapped to QString \row \li DATE - \li Null-terminated character string of the following format: - yyyy-mm-dd + \li Date consisting of year, month, and day \li Mapped to QDate \row \li TIME - \li Null-terminated character string of the following format: hh.mm.ss + \li Time consisting of hours, minute, seconds with optional fractional seconds \li Mapped to QTime \row \li TIMESTAMP - \li Null-terminated character string of the following format: yyyy-mm-dd-hh.mm.ss.nnnnnn + \li Date and time with optional fractional seconds \li Mapped to QDateTime \row \li BUILTIN.UUID @@ -561,7 +579,56 @@ \li Boolean \li bool \row - \li DECIMAL(p,s) - \li By default mapping to QString + \li INTERVAL YEAR(7) + \li Year, format '±yyyyyyy' (max precision) + \li Mapped to QString + \row + \li INTERVAL YEAR(7) TO MONTH + \li Year to month, format '±yyyyyyy-mm' (max precision) + \li Mapped to QString + \row + \li INTERVAL MONTH(7) + \li Month, format '±mmmmmmm' (max precision) + \li Mapped to QString + \row + \li INTERVAL DAY(7) + \li Day, format '±ddddddd' (max precision) + \li Mapped to QString + \row + \li INTERVAL DAY(7) TO HOUR + \li Day to hour, format '±ddddddd hh' (max precision) + \li Mapped to QString + \row + \li INTERVAL DAY(7) TO MINUTE + \li Day to minute, format '±ddddddd hh:mm' (max precision) + \li Mapped to QString + \row + \li INTERVAL DAY(7) TO SECOND(9) + \li Day to second, format '±ddddddd hh:mm:ss[.fffffffff]' (max precision) + \li Mapped to QString + \row + \li INTERVAL HOUR(8) + \li Hour, format '±hhhhhhhh' (max precision) + \li Mapped to QString + \row + \li INTERVAL HOUR(8) TO MINUTE + \li Hour to minute, format '±hhhhhhhh:mm' (max precision) + \li Mapped to QString + \row + \li INTERVAL HOUR(8) TO SECOND(9) + \li Hour to second, format '±hhhhhhhh:mm:ss[.fffffffff]' (max precision) + \li Mapped to QString + \row + \li INTERVAL MINUTE(10) + \li Minute, format '±mmmmmmmmmm' (max precision) + \li Mapped to QString + \row + \li INTERVAL MINUTE(10) TO SECOND(9) + \li Minute to second, format '±mmmmmmmmmm:ss[.fffffffff]' (max precision) + \li Mapped to QString + \row + \li INTERVAL SECOND(12,9) + \li Second, format '±ssssssssssss[.fffffffff]' (max precision) + \li Mapped to QString \endtable */ diff --git a/src/sql/doc/src/qt6-changes.qdoc b/src/sql/doc/src/qt6-changes.qdoc index a0ba654a38..28c4664fdd 100644 --- a/src/sql/doc/src/qt6-changes.qdoc +++ b/src/sql/doc/src/qt6-changes.qdoc @@ -5,7 +5,7 @@ \page qtsql-changes-qt6.html \title Changes to Qt SQL \ingroup changes-qt-5-to-6 - \brief Migrate Qt SQL to Qt 6. + \brief The return type for boundValues() has been changed in QSqlQuery class. Qt 6 is a result of the conscious effort to make the framework more efficient and easy to use. diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 47880fa2ec..4cc5b0d050 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -23,7 +23,7 @@ \table \header \li Driver name \li DBMS \row \li \l{#QDB2}{QDB2} \li IBM DB2 (version 7.1 and above) - \row \li \l{#QIBASE} \li Borland InterBase / Firebird + \row \li \l{#QIBASE}{QIBASE} \li Borland InterBase / Firebird \row \li \l{#QMYSQL}{QMYSQL / MARIADB} \li MySQL or MariaDB (version 5.6 and above) \row \li \l{#QOCI}{QOCI} \li Oracle Call Interface Driver (version 12.1 and above) \row \li \l{#QODBC}{QODBC} @@ -210,6 +210,16 @@ \l {https://dev.mysql.com/doc/refman/8.0/en/load-data.html} {LOAD_DATA}, disabled if not set or 0 \row + \li MYSQL_OPT_SSL_MODE + \li The security state to use for the connection to the server: SSL_MODE_DISABLED, + SSL_MODE_PREFERRED, SSL_MODE_REQUIRED, SSL_MODE_VERIFY_CA, SSL_MODE_VERIFY_IDENTITY. + \row + \li MYSQL_OPT_TLS_VERSION + \li A list of protocols the client permits for encrypted connections. The value can be + a combination of 'TLSv1' ,' TLSv1.1', 'TLSv1.2' or 'TLSv1.3' depending on the used \l + {https://dev.mysql.com/doc/refman/8.0/en/encrypted-connection-protocols-ciphers.html#encrypted-connection-protocol-configuration} + {MySQL server} version. + \row \li MYSQL_OPT_SSL_KEY / SSL_KEY (deprecated) \li The path name of the client private key file \row @@ -394,15 +404,20 @@ of the ODBC driver. ODBC support can be used as a fallback for compliant databases if no native driver is available. - On Windows, an ODBC driver manager should be installed by default. + On Windows, an ODBC driver manager is installed by default. For Unix systems, there are some implementations which must be installed first. Note that every end user of your application is required to have an ODBC driver manager installed, otherwise the QODBC plugin will not work. When connecting to an ODBC datasource, you should pass the name - of the ODBC datasource to the QSqlDatabase::setDatabaseName() + of the ODBC datasource (DSN) to the QSqlDatabase::setDatabaseName() function, rather than the actual database name. + It's also possible to pass a FILEDSN (*.dsn) filename or a complete + ODBC driver string. When passing a driver string you must make sure, + that all parameters (username, password, ...) are properly escaped. + Passing the username or password through the QSqlDatabase functions, + the escaping is done by the QODBC plugin. The QODBC Plugin needs an ODBC compliant driver manager version 2.0 or later. Some ODBC drivers claim to be version-2.0-compliant, @@ -713,6 +728,17 @@ \li Busy handler timeout in milliseconds (val <= 0: disabled), see \l {https://www.sqlite.org/c3ref/busy_timeout.html} {SQLite documentation} for more information + + \row + \li QSQLITE_USE_QT_VFS + \li If set, the database is opened using Qt's VFS which allows to + open databases using QFile. This way it can open databases from + any read-write locations (e.g.android shared storage) but also + from read-only resources (e.g. qrc or android assets). Be aware + that when opening databases from read-only resources make sure + you add QSQLITE_OPEN_READONLY attribute as well. + Otherwise it will fail to open it. + \row \li QSQLITE_OPEN_READONLY \li If set, the database is open in read-only mode which will fail @@ -735,7 +761,14 @@ \row \li QSQLITE_NO_USE_EXTENDED_RESULT_CODES \li Disables the usage of the \l {https://www.sqlite.org/c3ref/extended_result_codes.html} - {extended result code} feature in SQLite (for backwards compatibility) + {extended result code} feature in SQLite + \row + \li QSQLITE_ENABLE_NON_ASCII_CASE_FOLDING + \li If set, the plugin replaces the functions 'lower' and 'upper' with + QString functions for correct case folding of non-ascii characters + \row + \li QSQLITE_OPEN_NOFOLLOW + \li If set, the database filename is not allowed to contain a symbolic link \endtable \section3 How to Build the QSQLITE Plugin diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc index 3dfd005516..a7f87fe73f 100644 --- a/src/sql/doc/src/sql-programming.qdoc +++ b/src/sql/doc/src/sql-programming.qdoc @@ -496,11 +496,11 @@ submitted. The items in the view are rendered using a delegate. The default - delegate, QItemDelegate, handles the most common data types (\c + delegate, QStyledItemDelegate, handles the most common data types (\c int, QString, QImage, etc.). The delegate is also responsible for providing editor widgets (e.g., a combobox) when the user starts editing an item in the view. You can create your own delegates by - subclassing QAbstractItemDelegate or QItemDelegate. See + subclassing QAbstractItemDelegate or QStyledItemDelegate. See \l{Model/View Programming} for more information. QSqlTableModel is optimized to operate on a single table at a |