summaryrefslogtreecommitdiffstats
path: root/tests/auto/sql
Commit message (Collapse)AuthorAgeFilesLines
...
* Rest of QtBase tests: port away from deprecated methodsIvan Solovev2022-08-301-15/+4
| | | | | | | | | | Small changes to fix builds with QT_DISABLE_DEPRECATED_UP_TO >= 0x060500 Task-number: QTBUG-104858 Change-Id: Ia531a3cee97f13827e36b3d63f28eed879fe9a40 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-2316-16/+16
| | | | | | | Task-number: QTBUG-105718 Change-Id: I5d3ef70a31235868b9be6cb479b7621bf2a8ba39 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-08-0316-0/+48
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't use PUBLIC_LIBRARIES for tests and test helpersAlexandru Croitor2022-07-2813-13/+13
| | | | | Change-Id: I9b7404e1d3a78fe0726ec0f5ce1461f6c209e90d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-1615-405/+30
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Id880c92784c40f3bbde861c0d93f58151c18b9f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Replace uses of _qba with _baSona Kurazyan2022-04-071-3/+3
| | | | | | | Task-number: QTBUG-101408 Change-Id: I5175428c2be934b09f45bd06b0b47643003e25c7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Replace uses of _qs with _s in testsSona Kurazyan2022-04-071-20/+22
| | | | | | Task-number: QTBUG-101408 Change-Id: If092a68828a1e8056259cf90d035d9a87989244b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Deprecate {QString, QByteArray}::count()Sona Kurazyan2022-03-121-3/+3
| | | | | | | | | | | | And remove their uses. [ChangeLog][QtCore][Deprecation Notice] Deprecated QString::count() and QByteArray::count() that take no parameters, to avoid confusion with the algorithm overloads of the same name. They can be replaced by size() or length() methods. Change-Id: I6541e3235ab58cf750d89568d66d3b1d9bbd4a04 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add spaces round operators and at starts of comment textsEdward Welbourne2022-02-171-21/+21
| | | | | | | | | More mindless coding-style conformance. Includes moving & or * to after the space, not before, in declarations; and spaces after commas. Change-Id: I221fef1e4de69d6c55d33dfc533aa74e2fd72df0 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Purge stray spaces immediately inside parenthesesEdward Welbourne2022-02-171-961/+961
| | | | | | | | With one exception: in a macro-definition with a backslash-newline immediately following the open-parenthesis. Change-Id: I0fc8d7492676402636785d571e4667881334af6a Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Invert a condition to save a lot of indentationEdward Welbourne2022-02-171-38/+36
| | | | | | | | | | | | | Simply if (!condition) QSKIP(...) instead of having a long block depend on the condition with the QSKIP() in its else block (which should have had braces, as it was). While dedenting the code block, tidied up spacing: only include blank lines where they break up the code into blocks that go together, don't leave spaces just inside parentheses. Change-Id: I0196150088be88a7c6073b997a315b8f14d5f392 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery: fix usage of QtTest macrosEdward Welbourne2022-02-171-90/+90
| | | | | | | | | | | | | Use QVERIFY() rather than comparison to true; QVERIFY() the negation rather comparing to false; prefer QCOMPARE() otherwise for comparisons, except for a few special cases involving very long strings. Fix up the phrasing of a few QSKIP()s in the process. Also, QCOMPARE() can handle an enum as expected value without int-casting. Change-Id: I9a1b82e5f4e10df6427bcc184b7757737df7db4f Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery coding style: split lots of long linesEdward Welbourne2022-02-171-30/+50
| | | | | | | | In some cases by adjusting where the splits happen within concatenated strings. Change-Id: I4cffc41cda4582654151ba45d1478285caee7c81 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery coding style: clean up loopsEdward Welbourne2022-02-171-15/+13
| | | | | | | | Prefer pre-decrement over post-decrement, turn a while into a for, Don't put a while's body on the same line. Change-Id: I5653a9bcec7901d205a91927c4b08e3dc13e0ca6 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery coding style: clean up commentsEdward Welbourne2022-02-171-92/+86
| | | | | | | | | | | | Reflowed some over-long ones, fixed some typos, capitalise starts of sentences (and end them with suitable punctuation). Removed one as redundant, made another pair redundant by changing the code (use an overt NaN instead of commenting that it's happening). Prefer C++-style when single-line. Don't pretend to be QDoc comments, or have other eccentricities about start-markers. Change-Id: I5a30e1b22a08866124f09060bb35f5bd27cd443b Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery coding style: use vertical spacing to group linesEdward Welbourne2022-02-171-80/+6
| | | | | | | | | | Much of the test code simply had a blank line after each check. Keep the ones that separate groups of related statements, but remove the ones that separated members of such groups. In some cases swap a blank line and a code line to put the code with things it relates to. Change-Id: Ie33863080d407898b2b2f044599398980ab9793d Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_QSqlQuery coding style: clean up declarationsEdward Welbourne2022-02-171-55/+47
| | | | | | | | | | | | | Split some long declarations of two variables in one line into two separate declarations. Made more things const, made some consts constexpr. Skip a variable entirely when it's only used once (and not giving us some other benefit). Moved some declarations closer to their variables' first uses. Replace some Capitalised variable names with lower-case ones. Change-Id: I3b8dac46530ba1c2e6100cb007b5487253304526 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Prefer QLatin1String::arg() over adding more than two stringsEdward Welbourne2022-02-171-407/+507
| | | | | | | | | | It saves the conversion to UTF-16 until the formatting. Split up long lines, purge spaces just inside parentheses, and otherwise tidy affected lines. Don't use backslash-newline for line continuation within string literals; juxtaposition is cleaner. Change-Id: I9c3d3e33f5ecbdb530538679147f7bc32afbeb05 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Prefer u"..." and u"..."_qs over QStringLiteral() or QString("...")Edward Welbourne2022-02-171-101/+101
| | | | | | | | | | It's terser and cleaner to read. Likewise for QString::fromLatin1(). QCOMPARE() can take a QStringView, hence u"..." as its expected string; other uses need u"..."_qs. Change-Id: Iaf96569ff3ce69c890badfb6e40f702a78b100b3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Prefer QString::asprintf() over QString::arg when formatting numbersEdward Welbourne2022-02-171-5/+9
| | | | | | | | | Marc alleges it is more efficient. Corrected part of a message to be more accurate in the process. Save some casting by using suitable format specifiers. Change-Id: Ic31a4e17b8910d35781a494ec860c7a08f08f33b Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Prefer QLatin1String::arg() over QString::arg() for ASCII literalsEdward Welbourne2022-02-171-45/+44
| | | | | | | | | | | | | When the format is an ASCII string, there's no point widening it to UTF-16 before the actual formatting step. Also, don't construct the format string using string arithmetic, when passing another parameter to arg() will do just as well. In the process, restructured generic_data(), split long lines and conform spacing to Qt coding style on affected lines. Simplified initialization of two string fragments by using QL1S instead of QString, too. Change-Id: Ib101dcf9296cc532291518bcef8e0a8de597b8a0 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* tst_qsqlquery coding style: use braces correctlyEdward Welbourne2022-02-151-11/+13
| | | | | | | | | Single-line bodies of single-line controls don't need braces. If one block of an if/else chain needs braces, the rest get them too. One long condition needed a split that forced its body to need braces. Change-Id: Ic4116b1273e16a586fdec18e6d8228e48a9cb07c Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Prefer QString(count, character) over QString::fill()ingEdward Welbourne2022-02-151-8/+4
| | | | | | | It lets the string be const, if nothing else. Change-Id: Iffc1cfe71c5f6030b3f7434f964f2f2c102bf9c0 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Avoid repeated qTableName() calls by saving in local variablesEdward Welbourne2022-02-151-35/+45
| | | | | | | | | | | | | | | This saves repetition of the call in the midst of query strings. This incidentally makes it possible to give informative names. In the process, build those query strings using QLatin1String::arg(), instead of implicitly converting ASCII strings to QString in order to then do arithmetic with them, at least when the arithmetic involves more than one addition. In one instance, where two branches did the same thing with different format strings, limit the branching to selecting which string to use, then do the common thing once. Change-Id: I60fd7457a727bcc3872d3052d8fd638ebaf36ac2 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Use lists and arrays more gracefully in tst_qsqlqueryEdward Welbourne2022-02-151-88/+80
| | | | | | | | | | | | | | | | | | | | | | | | | Use initializer lists rather than << entries. Use arrays where we don't need the lists at all. Make them const when they can be. Replace foreach with ranged-for. Use auto rather than naming iterator types and save end() at the start of the iteration to save re-requesting it each time round the loop. Reverse arguments to a QCOMPARE() as actual should come first and expected after, not the other way round. Change some casts from C-style to type-as-function-style, use QString literals rather than C-string literals that would need conversion at compile time and QLatin1String::arg in preference to arithmetic where the same format is duplicated. In the process, reworked one test to put its two iterations, one over good query strings, one over bad ones, into separate blocks using separate const arrays, instead of reusing a list with an uninformative name. Change-Id: I4a272be3eb58e9dca136238277b92379d6ca076d Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use function-style casts in preference to C-style onesEdward Welbourne2022-02-101-61/+60
| | | | | | | | | In one case, cast an int to qsizetype rather than the other way round, in order to compare them. Change-Id: Id8dffe61f9565040f1a5ee24867956397f814a55 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Convert some if/else-if/else chains into switch()esEdward Welbourne2022-02-101-99/+146
| | | | | | | | | | | | | | | | Some of the else if lines exceeded 100 characters, so should have been split; and some lines already were split. So each whole chain should have had braces on its bodies. Instead make it a switch, as this makes it more evident what's going on in any case. Furthermore, as each branch did the same thing with dbType-specific strings, change to just setting QLatin1String variables, so that the rest of the code needn't be duplicated in each branch; it can simply be done once after the switch, using the string's .arg() to embed fragments. In the process break up the SQL query strings more gracefully, purge spaces just inside C++ parentheses. Change-Id: Ie26166e098ad74720bb6d7c4d9fe47718c33a13c Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Convert some QVERIFY2() with useless messages to QVERIFY()Edward Welbourne2022-02-101-8/+5
| | | | | | | | | | | | | | | Telling us the condition tested should have been true is what QVERIFY() does anyway, so don't go to the whole trouble of saying the same thing - and wrapping it in in a QString() merely in order to then qPrintable() it back out again, pointlessly converting a C-string to unicode and back again. At the same time, skip one other qPrintable(QString("...")) without .arg() formatting; and change the check it's the message for to use QL1S::arg() instead of QString::arg(). Change-Id: Ie71a79da8017916d301a38b69fc422e55a5a3649 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Suppress, and thus verify we do get, two warnings in tst_QSqlQueryEdward Welbourne2022-02-101-0/+5
| | | | | | | | Expected warnings are clutter for anyone reding the output, so suppress them when they're correct behavior. Change-Id: Idf47ba4fab8069237067d9b20afef3041e0c2f8c Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Use qScopeGuard() to take care of post-test tidy-upEdward Welbourne2022-02-101-22/+27
| | | | | | | | | | | | | | Doing the tidy-up after the last check has the problem that it gets skipped if any check fails, as the premature return skips the tidy-up. In the process, added the missing tidy-up to prematureExec(). Repackage the code for one tidy-up as a named lambda so that the duplicate can share it with the scope guard. Made some existing scope guards const, while I was about it, so that the one that isn't - because it gets dismiss()ed - stand out. Change-Id: I96d6834d5d7675f15018169a7093b0211db6f8a9 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Get rid of empty optional methods in tst_QSqlQueryEdward Welbourne2022-02-091-10/+0
| | | | | | | | | | No need for a virtual do-nothing destructor in a class that isn't inherited from. Defining an empty init merely makes QTest go to the trouble of calling it, which it could just as well skip. Change-Id: Ifd44c473c05fdeaaa7923d2ccdd0a13c8921b6bd Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Move prematureExec() to the end of tst_qsqlquery's testingEdward Welbourne2022-02-031-2/+4
| | | | | | | | | | | | | It leaves the system in a state that breaks at least one later test, so put it last. (This was first seen when picking back to 6.2, but I am now able to reproduce it on dev.) Amends commit 78eac57f3dc788345f8f3e9b6dbd3dce70b8f511 Pick-to: 6.3 Change-Id: I918cf43cdfc27357329a175518d6f9755747bae5 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Check for null driver() before trying to exec()Edward Welbourne2022-01-251-1/+32
| | | | | | | | | | | | QSqlQuery::exec() took for granted that it can dereference driver(), which should be true for all sane usage; however, it should not crash if used misguidedly. Added regression test, based on bug report's reproducer, which crashes without the fix. Fixes: QTBUG-100037 Pick-to: 6.3 6.2 5.15 5.12 Change-Id: I94600bc60f89e82a1121b418144006a683921a38 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Adapt SQL drivers to Qt 6 change of QVariant::isNullVolker Hilsheimer2022-01-121-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | In Qt 5, QVariant::isNull returned true if either the variant didn't contain a value, or if the value was of a nullable type where the type's isNull member function returned true. In Qt 6, QVariant::isNull only returns true for variants that don't contain a value; if the value contained is e.g. a null-QString or QDateTime, then QVariant::isNull returns false. This change requires a follow up in the SQL drivers, which must still treat null-values the same as null-variants, lest they write data into the data base. Add a static helper to QSqlResultPrivate that implements isNull-checking of variants that contain a nullable type relevant for Sql, and add a test case to the QSqlQuery test that exercises that code. Pick-to: 6.2 6.3 Fixes: QTBUG-99408 Fixes: QTBUG-98471 Change-Id: I08b74a33aa3235c37d974f182da1f2bdcfd8217e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* testlib: Deprecate QWARN() in favor of qWarning()Tor Arne Vestbø2021-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The QtTest best practices documentations recommends using output mechanisms such as qDebug() and qWarning() for diagnostic messages, and this is also what most of our own tests do. The QWARN() macro and corresponding internal QTest::qWarn() function was added when QtTest was first implemented, but was likely meant as an internal implementation detail, like its cousin QTestLog::info(), which does not have any corresponding macro. This theory is backed by our own QtTest self-test (tst_silent) describing the output from QWARN() as "an internal testlib warning". The only difference between QWARN() and qWarning(), besides the much richer feature set of the latter, is that qWarning() will not pass on file and line number information in release mode, but QWARN() will. This is an acceptable loss of functionality, considering that the user can override this behavior by defining QT_MESSAGELOGCONTEXT. [ChangeLog][QtTest] QWARN() has been deprecated in favor of qWarning() Pick-to: 6.2 Change-Id: I5a2431ce48c47392244560dd520953b9fc735c85 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSqlTableModel::orderByClause(): Quote the table nameFriedemann Kleint2021-05-031-24/+26
| | | | | | | | | | | This ensures correct handling of names with special characters. Pick-to: 5.15 6.1 Fixes: QTBUG-92584 Change-Id: I95c7c54d9c7ee00b221a55f3d07ef1ec3a3bd217 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* SQLite: Handle tables and fields with a dot in the name correctlyAndy Shaw2021-04-231-0/+49
| | | | | | | Fixes: QTBUG-91885 Pick-to: 6.1 6.0 5.15 Change-Id: Iba76bb50266dd4fb5f50e4ea1549d1d2bb6e3431 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Disable warnings for tests using QSqlQuery assignmentVolker Hilsheimer2021-04-111-0/+6
| | | | | | | | Copying is deprecated as of 14f9f00fdb2dc428610c08e3d9d03e38e9602166. Pick-to: 6.1 Change-Id: I235d45ff6769a29a4fdfd888c20dd9fe2fe81346 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QSqlQuery: make it a move only typeGiuseppe D'Angelo2021-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSqlQuery is a broken value class. Copying one object would mean copying database state (the result set, the cursor position, etc.) which isn't generally available for all database drivers. For that reason, the current implementation does not honor value semantics -- modifying a QSqlQuery object has visible side effects on its existing copies (!). The correct solution is to accept that QSqlQuery is a move only type, not a value type. Add move semantics to it, and deprecate its copies. (We can't just *remove* copies in Qt 6 due to SC/BC constraints). [ChangeLog][QtSql][QSqlQuery] QSqlQuery copy operations have been deprecated. QSqlQuery copy semantics cannot be implemented correctly, as it's not generally possible to copy a result set of a query when copying the corresponding QSqlQuery object. This resulted in modifications on a QSqlQuery having visible (and unintended) side effects on its copies. Instead, treat QSqlQuery as a move-only type. Fixes: QTBUG-91766 Change-Id: Iabd3aa605332a5c15c524303418bf17a21ed520b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix a few compiler warnings in testsAllan Sandfeld Jensen2021-02-021-1/+1
| | | | | Change-Id: I22f6ac8ed02dd4ef4083ce3c781552623a0b08da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QODBC: Preserve the whole value when using HighPrecisionAndy Shaw2021-01-141-0/+35
| | | | | | | | | | | | Some ODBC drivers do not properly handle SQL_NO_DATA and therefore decimal values returned with HighPrecision are cut off because the decimal point is not taken into account. Fixes: QTBUG-73286 Pick-to: 6.0 5.15 5.12 Change-Id: I905c947b4d0266a3245d5735300300ca00f77480 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Sql ODBC driver: add direct support for float and short datatypeChristian Ehrlicher2021-01-101-0/+37
| | | | | | | | | | | | | This patch adds native support for SQL_REAL (float) and SQL_SMALLINT (short). Previously those datatypes were mapped to double and integer. [ChangeLog][QtSql] The ODBC driver now properly maps QMetaType::Float to real sql datatype and QMetaType::Short to smallint Fixes: QTBUG-8963 Fixes: QTBUG-57279 Change-Id: Ifec4c609734dbe6165c1ebdadb461c2aae47ba78 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* PSQL: Fix the QSqlDatabase testAndy Shaw2021-01-071-5/+15
| | | | | | Pick-to: 6.0 5.15 Change-Id: Ic7956b556f1f0f10574fd79f5cbd283208240353 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Remove the qmake project filesJoerg Bornemann2021-01-0716-97/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Replace QtTest headers with QTestDavid Skoland2020-12-2214-14/+21
| | | | | | | | | | | Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup remaining QVariant::Type uses in Qt SqlLars Knoll2020-10-175-243/+243
| | | | | Change-Id: Ibcaa678cd9f9c957392a75b477fa6821f9a69127 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Another round of replacing 0 with nullptrAllan Sandfeld Jensen2020-10-072-6/+6
| | | | | | | | | This time based on grepping to also include documentation, tests and examples previously missed by the automatic tool. Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-09-2313-13/+13
| | | | | | | | | | | Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Interbase: Handle EXECUTE BLOCK statements correctlyAndy Shaw2020-09-131-0/+22
| | | | | | | | | | | | Since an EXECUTE BLOCK statement can have a mix of ? and :var syntax then a special case for this needs to be added so that it does not try to convert the :var parts into positional placeholders as they need to kept as-is when preparing such a statement. Pick-to: 5.15 Fixes: QTBUG-83152 Change-Id: Iff891207ad6dea1681a1b3a335acbbbb668b465d Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Interbase: Add support for the boolean typeAndy Shaw2020-09-112-4/+9
| | | | | | | | | | | | | This is added to Interbase in v7 and Firebird in v3 which has been available for sometime now. This means the minimum supported for Interbase is now v7. [ChangeLog][QtSQL][Interbase] The minimum required version for Interbase is now v7. Fixes: QTBUG-83401 Change-Id: I9927fd962f25c935be8ed5d2b7c76c00fb88cd8c Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>