summaryrefslogtreecommitdiffstats
path: root/src/sql
Commit message (Collapse)AuthorAgeFilesLines
* Change to release licenses for 4.6.3.Jason McDonald2010-05-3051-663/+663
| | | | Reviewed-by: Trust Me
* Fix sqlite driver doesn't return error message RAISE by a trigger.Bill King2010-04-201-0/+1
| | | | | Task-number: QTBUG-7988 Reviewed-by: Justin McPherson
* Fix ODBC compilation for ODBC versions < 3.5Bill King2010-03-251-0/+2
| | | | | Task-number: QTBUG-8488 Reviewed-by: Justin McPherson
* Unicode fixes for ODBC SQL Driver.Bill King2010-03-251-38/+117
| | | | | | | | Better unicode handling detection, plus turn off unicode if FreeTDS, plus handling of returning strings under non-unicode scenarios. Task-number: QTBUG-8846 Reviewed-by: Justin McPherson
* Ensure that the entire CLOB can be returned from an Oracle databaseAndy Shaw2010-03-121-2/+2
| | | | | | | | | The original CLOB was being truncated at 4000 bytes, even though the CLOB can hold up to 4gig, this ensures that its possible to get the whole thing. There is already a test in qsqlquery for this. Task-number: QTBUG-3875 Reviewed-by: Bill King
* Fixes: Mysql truncation of integer values + some autotest cleanupBill King2010-03-051-0/+17
| | | | Task-number: QTBUG-5765
* Update documentation with warning about setForwardOnlyBill King2010-03-052-0/+6
| | | | Task-number: QTBUG-8752
* Updating SQL binding docs to reflect reality.Bill King2010-03-032-1/+17
| | | | | Task-number: QTBUG-7218 Reviewed-by: Justin McPherson
* Fix compile.Bill King2010-03-021-30/+30
| | | | | | Stupid inconsistent constness/overall api Task-number: QTBUG-6928
* Fixes: ODBC Driver expects 16bit when system is 32bitBill King2010-03-023-109/+169
| | | | | | | | Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2 bytes wide. Task-number: QTBUG-6928 Reviewed-by: Justin McPherson
* Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| | | | This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
* (ODBC) Use wchar_t instead of assuming 2 bytes.Bill King2010-02-101-10/+27
| | | | | | On some platforms, especially iODBC, wchar_t is a 32bit value, not 16 Task-number: QTBUG-6928
* (sqlite) Allow shared cache modeBill King2010-02-092-28/+20
| | | | | | | This modification is needed to allow performance optimisations necessary for QML. Reviewed-by: Warwick Allison
* optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-012-3/+3
| | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1151-51/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) QNAM HTTP Code: Cache socket state inside ensureConnection() tst_qhttpnetworkconnection: Test also HEAD in some tests tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities QNAM HTTP Code: When starting new request, prefer connected sockets. typo fix Added the 'framecapture' WebKit example to the default build. Fix code example fix typo in qreadwritelock's documentation QNAM HTTP: Don't call d_func() so often QNAM HTTP: Fix readBuffer maximum size. QNAM HTTP: Optimize eatWhitespace() QNAM HTTP: Check if socket already tries to connect. network internals: fix build on S60 [syncqt] Make -separate-module work with WebKit's directory structure doc: Corrected explanation of when append() does nothing. doc: Added clarification about allocating space for the 0 terminator. Add a way to access the normalised URL in QUrl. [syncqt] Make it possible to synchronize headers for a separate module [syncqt] Make it possible to override the base directory network internals: start HTTP GET requests right away when called ...
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0751-51/+51
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | * Update copyright year to 2010Jason McDonald2010-01-0651-51/+51
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | (Sqlite2) Fix for QTBUG-6421Bill King2010-01-111-4/+12
|/ / | | | | | | | | | | | | | | Forgot to port the fix over to sqlite2 which seems to also be affected by the setForwardOnly caching bug as well. Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* | (ODBC) Handle drivers that return SQL_NO_DATA for exec success.Bill King2010-01-051-1/+6
|/ | | | | | | | | Most drivers return SQL_SUCCESS when executing a delete statement for example, but FreeTDS returns SQL_NO_DATA, which is technically correct, but doesn't follow the practice of other drivers. Task-number: QTBUG-4896 Reviewed-by: Justin McPherson
* (OCI) Fixes problem with clobs being handled as binaryBill King2009-12-171-2/+2
| | | | | | | CLOB/NCLOB/LONG are actually strings, so treat them as such. Task-number: QTBUG-4461 Reviewed-by: Justin McPherson
* (ODBC) Fixes segfault when error string is larger than 256 chars.Bill King2009-12-151-6/+17
| | | | | | | | | | SqlServer can throw custom error messages (via RaiseError) that can be up to 8000 chars long. Fixed this with a pre-query as to the length of the error string, then allocating enough space to retrieve the whole error string at once. Task-number: QTBUG-6618 Reviewed-by: Derick Hawcroft
* Proper fix for QTBUG-6421Bill King2009-12-072-5/+17
| | | | | | | fixes setForwardOnly() for both OCI and SQLite Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* Revert previous commit as it breaks an sqlite assumption.Bill King2009-12-041-5/+0
| | | | | | During the exe(), sqlite does it's first stepping, and stores that into the cache. It assumes that that value is still in the cache when fetchNext() is called, and uses the "cached" value to return.
* Fixes: QOCI setForwardOnly(true) accumulating values.Bill King2009-12-041-0/+5
| | | | | | | | | | readPiecewise() is assuming an empty valueCache when reading a new row. setForwardOnly(true) means that only one row is used/re-used. The value cache wasn't being cleared out when moving to a new row, so the above assumption was invalid. Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-021-31/+52
| | | | | Task-number: QTBUG-5298 Reviewed-by: Justin McPherson
* remove unused line of codeDerick Hawcroft2009-12-011-1/+0
| | | | Task-number: QTBUG-6387
* Fixed QSqlRelationalTableModel doesn't correctly work with relation in other ↵Bill King2009-11-301-1/+1
| | | | | | | | | | database schema PSQL doesn't like having schema scoping in "AS" aliasing of fields, so use everything after the last "." separator for generating the alias. Task-number: QTBUG-5373 Reviewed-by: Justin McPherson
* Handle errors and data truncation in QMYSQLResult::fetchNext()Derick Hawcroft2009-11-231-5/+13
| | | | | | | Add additional error handling Task-number:QTBUG-5758 Reviewed-by: trustme
* Don't reset view if a query fails.Derick Hawcroft2009-11-091-4/+5
| | | | | | | | The view of a table gets reset if for example a query fails. However this also resets and removes the Header views of the table. A better solution visually is to keep them displayed. Task-number: QTBUG-3162
* Merge branch '4.5' into 4.6Morten Johan Sørvig2009-11-052-2/+2
|\ | | | | | | | | | | Conflicts: tests/auto/qsqlquery/tst_qsqlquery.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Fix retrieval of SQL type "TIME" information for PostgreSQLDerick Hawcroft2009-11-051-1/+1
| | | | | | | | | | | | | | | | PostgreSQL can store/retieve the millisecond part of type "TIME" , so allow it in the API level. Task-number: QTBUG-5251 Reviewed-by: Bill King
| * Check success of query.Derick Hawcroft2009-11-051-1/+1
| | | | | | | | | | | | | | For example a bogus use of setFilter() might cause a query to fail. Check for this. Reviewed-by: Bill King
* | Fixed lastError() for QTDS driver. Previously, no lastError was available on ↵Mark Brand2009-11-041-5/+16
| | | | | | | | | | | | | | syntax errors, bad column names, etc. Merge-request: 1987 Reviewed-by: Bill King <bill.king@nokia.com>
* | Fixed handling of database level precision policy for sqlite driver.Yuecel Ahi2009-11-021-5/+1
| | | | | | | | Reviewed-by: Bill King <bill.king@nokia.com>
* | Fixes Floating point number truncation in qsqlpsql plugin under linuxBill King2009-11-021-1/+1
| | | | | | | | | | | | | | replaces strtod call with locale aware QString::toDouble() Task-number: QTBUG-5179 Reviewed-by: Justin McPherson
* | Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-291-2/+9
|\ \
| * | Fixes Oracle batchExec using strings as out params.Bill King2009-10-271-2/+9
| | | | | | | | | | | | | | | | | | reserve() affects capacity(), not length(). Task-number: QTBUG-551
* | | Fixed crash when setting header data in QSqlQueryModel.Gabriel de Dietrich2009-10-261-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash (Q_ASSERT_X failure) happened when a proxy model was being attached to the QSqlQueryModel, and no query was set yet. The headerDataChanged() signal was being received by the proxy model who wouldn't check its "proxyfied" data bounds. The patch introduces a behaviour change. However, this change makes the usage of QSqlQueryModel::setHeaderData() to be more in accordance with the current documentation, and to behave in the same way as for QStandardItemModel, QTreeModel, and QTableModel. Task-number: QTBUG-4963 Reviewed-by: Olivier
* | ODBC: Retrieved in ascii, should be stored in ascii.Bill King2009-10-191-1/+1
| | | | | | | | | | | | For non-unicode databases, use ascii. Task-number: QTBUG-3736
* | Doc: clarified what addDatabase() returns if the driver cannot be loadedStian Sandvik Thomassen2009-10-131-0/+2
| | | | | | | | | | | | If the driver cannot be loaded, isValid() returns false. Reviewed-by: Bill King
* | Fixes issue with multiple lookups to same table/fieldBill King2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | Previously the renaming scheme created a new table_field alias name. If multiple references referred to the same table/field lookup, then multiples of the same alias would be generated in the query, leading the query to fail. Reviewed-by: Justin McPherson
* | Update documentation for setForwardOnly.Bill King2009-10-062-3/+13
| |
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-302-1/+16
|\ \ | |/ | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp src/3rdparty/webkit/WebCore/generated/CSSGrammar.h (merged webkit files with -s ours)
| * (TDS) Fixes improper formatting of date valuesBill King2009-09-301-1/+3
| | | | | | | | Task-number: QT-754
| * (TDS) Fixes missing field/table name escaping.Bill King2009-09-302-0/+13
| |
* | (ODBC) Better fix for readonly result setBill King2009-09-302-5/+13
| | | | | | | | | | | | | | This fixes an issue where a forwardonly result set would force forwardonly on the next query, despite what the user had explicitly set. Reviewed-by: Justin McPherson
* | Add reconnection option to the mysql driver.Bill King2009-09-222-0/+14
| | | | | | | | | | | | adds MYSQL_OPT_RECONNECT to the mysql driver options. Task-number: QTBUG-4510
* | Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-0/+10
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| * Fixes issue of forward only datasets failing when not set so.Bill King2009-09-171-0/+10
| | | | | | | | | | | | | | | | | | Previously you had to set forward only on non-scrollable datasets explicitly. This queries ODBC, to determine if it's a scrollable dataset, and sets forwardOnly to false if it isn't. Task-number: QT-353 Reviewed-by: Justin McPherson
* | Merge commit 'origin/4.5' into 4.6Bill King2009-09-142-4/+8
|\ \ | |/