summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/odbc
Commit message (Collapse)AuthorAgeFilesLines
* qsql_odbc: fix SQLGetStmtAtt usageMark Brand2013-04-241-5/+3
| | | | | | | | | | | | | | | | | | | | Failure to initialize the variable can cause spurious non-zero values. http://msdn.microsoft.com/en-us/library/windows/desktop/ms715438(v=vs.85).aspx "..value can either be a SQLULEN value or a null-terminated character string. If the value is a SQLULEN value, some drivers may only write the lower 32-bit or 16-bit of a buffer and leave the higher-order bit unchanged. Therefore, applications should use a buffer of SQLULEN and initialize the value to 0 before calling this function. Also, the BufferLength and StringLengthPtr arguments are not used." Follow-up to 1509316a37fb2d365230d020d1dfc251c830fd56 Change-Id: I2e92eb845a2590bea0849c52bde8902adff1b419 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry-picked from qtbase commit af35ee291a1bbbc8627f9a17f7e104898d49b138)
* ODBC: lost info about column metadata on SQL_NO_DATAIsrael Lins2013-04-241-5/+0
| | | | | | | | | | In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata is ignored. Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* ODBC: fixed consistence of return of QODBCResult::exec()Israel Lins2013-04-241-1/+1
| | | | | | | | | | | | The QODBCResult::exec() returns false when query is an delete with no data do delete caused by SQLExecute function returning SQL_NO_DATA, but the false return means error on execution. Task-number: QTBUG-10569 Change-Id: I6c7ebadcf62ab404b60c7bcccdab6a10bf16a923 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry-picked from qtbase commit 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* ODBC: fix loss of milliseconds when binding QDateTimeIsrael Lins2013-04-241-1/+1
| | | | | | | | | | | | Caused by operator precedence error. Follow-up to commit b8b79a0f37ec74fd5b4ad829e522a384ba3622ae Task-number: QTBUG-2192 Change-Id: I17decd18c469b48a0bc938ae05c16cced8042219 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry-picked from qtbase commit 36b6d4afc970a328cced87af3d39b70d327eb3ad) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-132-2/+2
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-10-081-4/+42
| | | | | | | | | | | | | | SQL Server 10 introduced stricter rules for TIMESTAMP validation, making it necessary to specify the decimal digits. Other databases might do the same as well, so this patch introduces a check for the TIMESTAMP column size and adjusts the decimal digits parameter as needed. Task-number: QTBUG-2192 Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-292-48/+48
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-012-4/+4
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix memory leak in 64-bits ODBC driverHonglei Zhang2012-04-271-1/+2
| | | | | | | | | This fix complements the commit 8c28db8cda. A similiar function call was forgotten in the previous fix. Task-number: QTBUG-25256 Change-Id: I38880e755a78951985484b718c89ac43a6dc2b4c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()Yan Shapochnik2012-04-201-1/+2
| | | | | | | | | | | | | Windows API call to SQLGetStmtAttr() attempts to place an 8 byte value into the isScrollable variable which of type SQLINTEGER which is a long and is 32 bit on Windows even when the driver is compiled for 64 bit. Changing the isScrollable to and 8 byte SQLULEN type. Task-number: QTBUG-25256 Change-Id: I1aae0b306e8d1ff5fc3b293b3e9ddd40546b85ad Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-112-2/+2
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-132-34/+34
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-1/+1
|\ | | | | | | | | | | Conflicts: mkspecs/features/symbian/application_icon.prf src/sql/drivers/odbc/qsql_odbc.cpp
| * Fix warning in ODBC driver: passing NULL to non-pointer.Thiago Macieira2011-01-261-2/+2
| | | | | | | | | | Warning was: passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-172-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-102-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | fix two more "comparison between signed and unsigned integer expressions" ↵Konstantin Ritt2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | warnings SQLLEN is unnecessarily an unsigned int Merge-request: 955 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| | * Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | the unicode flag is entirely overrided by mistake. Task-number:QTBUG-13109 Reviewed-by:Michael Goddard
* | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-23/+14
|/ / | | | | | | | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | fix macx not having UNICODE in DEFINES any moreOswald Buddenhagen2010-07-131-7/+7
| | | | | | | | and make the cascade a bit nicer on the way ...
* | Simplify *= to += after contains() testMark Brand2010-07-071-2/+2
| | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Consolidate sql driver configuration redundancyMark Brand2010-07-071-0/+13
| | | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix compilation on WinXP MinGW32;lit-uriy2010-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, I get an error when building plug QODBC: drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)': drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified' drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)': drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions Env: Windows XP SP2 MinGW (GCC 4.4.0 from trolls ftp) Merge-request: 2402 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-38/+119
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * 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
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-107/+163
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * 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-022-109/+168
| | | | | | | | | | | | | | | | 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
* | improve sql support for mingw64Thierry Bastian2010-02-231-1/+1
| |
* | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-222-30/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * Merge remote branch 'origin/master'Olivier Goffart2010-01-081-7/+23
| |\
| * | Remove obsolete code for unsupported platformsBill King2009-12-162-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This code was apparently put in for OSX10.3. ODBC2 is over 10 years old now, and even microsoft doesn't support any fashion to link to the ansi versions of the functions. Remove the #define so that we don't have to support it any more. Reviewed-by: Justin McPherson
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-072-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | (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
* | (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
* 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
* (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
* 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
| * Fixes determination of end of odbc string on deficient driverBill King2009-09-101-6/+6
| | | | | | | | | | | | | | Ported this fix backwards from 4.6 to 4.5 Adds some cleanups (using QVarLengthArray), and reverting to the initial and correct calculation (when the driver doesn't deem fit to return SQL_NO_DATA).
| * Update license headers again.Jason McDonald2009-09-082-8/+8
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers again.Jason McDonald2009-09-092-8/+8
| | | | | | | | Reviewed-by: Trust Me
* | Fixes determination of end of odbc string on deficient driverBill King2009-09-011-6/+6
| | | | | | | | | | | | Adds some cleanups (using QVarLengthArray), and reverting to the initial and correct calculation (when the driver doesn't deem fit to return SQL_NO_DATA).
generated by cgit v0.12 at 2025-09-07 01:34:16 (GMT)