diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-09-30 22:00:57 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2022-10-22 09:45:13 +0200 |
| commit | 7d99fa8e5bf036f97d8ef41780f6e401b32f47ef (patch) | |
| tree | e6c35061c323e12921829bfcb9c87ae45cd5c3f6 /src/sql/kernel/qsqldatabase.cpp | |
| parent | 603ff452284dddf166693e0c041968851f605742 (diff) | |
| download | qtbase-7d99fa8e5bf036f97d8ef41780f6e401b32f47ef.tar.gz | |
SQL/MySQL: rework driver option parsing
Rework the parsing of client option to make it easier to add new
options. Add the two options MYSQL_OPT_SSL_CRL and MYSQL_OPT_SSL_CRLPATH
and deprecate the SSL_foo options without the MYSQL_OPT_ prefix.
Change-Id: Ibaf5f553d77d9c102ca2bfef2fe68be0572f594b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 920740fcbe..254d6d46a8 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1132,11 +1132,18 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li MYSQL_OPT_CONNECT_TIMEOUT \li MYSQL_OPT_READ_TIMEOUT \li MYSQL_OPT_WRITE_TIMEOUT - \li SSL_KEY - \li SSL_CERT - \li SSL_CA - \li SSL_CAPATH - \li SSL_CIPHER + \li MYSQL_OPT_SSL_KEY + \li MYSQL_OPT_SSL_CERT + \li MYSQL_OPT_SSL_CA + \li MYSQL_OPT_SSL_CAPATH + \li MYSQL_OPT_SSL_CIPHER + \li MYSQL_OPT_SSL_CRL + \li MYSQL_OPT_SSL_CRLPATH + \li SSL_KEY (deprecated, use MYSQL_OPT_SSL_KEY) + \li SSL_CERT (deprecated, use MYSQL_OPT_SSL_CERT) + \li SSL_CA (deprecated, use MYSQL_OPT_SSL_CA) + \li SSL_CAPATH (deprecated, use MYSQL_OPT_SSL_CAPATH) + \li SSL_CIPHER (deprecated, use MYSQL_OPT_SSL_CIPHER) \endlist \li |