summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/odbc
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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).
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-312-26/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-312-26/+26
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-112-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Fixes race condition on reopening an ODBC connection.Bill King2009-08-311-11/+11
| | | | | | | | | | | | Original code was keeping it's own (out of date) copy of the handles. It now includes a pointer to the driver private, and asks that what the handles are instead.
* | Fixes invalid use of staticsBill King2009-08-271-30/+24
| | | | | | | | | | | | | | | | Multiple database connections could have differing ideas on the return value for defaultCase. The cost of the call is so minimal that caching is unnecessary, and static caching is very very wrong. Reviewed-by: Justin McPherson
* | Fixes proper quoting under odbc.Bill King2009-08-131-11/+5
| | | | | | | | | | | | | | Query the database for the quoting charachter, don't assume you know what it is. Reviewed-by: Justin McPherson
* | Update contact URL in license headers.Jason McDonald2009-08-122-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Fix (some) spelling and grammatical errors in translatable strings.Volker Hilsheimer2009-07-161-1/+1
| | | | | | | | | | | | | | Requires an update of existing translations. Fixes: 247314 Reviewed-by: TrustMe
* | Fixes a heisenbug when using two ODBC connections with diff quoters.Bill King2009-07-101-7/+9
| | | | | | | | | | | | | | Can have situations where 2 odbc connections are active, that have differing quoting charachters. Before this fix, everything fell over. Reviewed-by: Justin McPherson
* | Merge branch '4.5'Thiago Macieira2009-07-021-1/+3
|\ \ | |/
| * Tinyint is unsigned, force it to such.Bill King2009-07-021-1/+3
| | | | | | | | | | Tinyint only supports 0-255, so mark it as unsigned despite sign flag, which have the time is inverted/wrong.
* | Merge branch '4.5'Thiago Macieira2009-07-021-1/+1
|\ \ | |/
| * Don assume QVariant::String data is going to always be unicode in QODBCDerick Hawcroft2009-06-301-1/+1
| | | | | | | | | | | | - as was not the case for the psqlODBC driver Reviewed-by: Bill King
* | src/sql: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-8/+1
| | | | | | | | | | | | | | Also remove many #ifdef UNICODE blocks Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge branch '4.5'Marius Storm-Olsen2009-06-301-0/+1
|\ \ | |/
| * bug fixDerick Hawcroft2009-06-301-0/+1
| | | | | | | | | | | | | | - case for QVariant::Bool in switch statement was missing Task-number: 215511 Reviewed-by: TrustMe
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-241-19/+1
|\ \ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| * \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-19/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * make the last checkin compile.Bill King2009-06-231-2/+0
| | |
| | * Fixes non-unicode strings should be strings, not bytearrays.Bill King2009-06-231-17/+1
| | | | | | | | | | | | | | | | | | Passes all autotests. Task-number: 251739
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-162-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"Bill King2009-06-152-132/+0
| | | | | | | | | | | | | | | This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3 due to forward binary compatibility issues in a point release.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-221-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| * | Make previous checkin compile.Bill King2009-06-221-3/+0
| | |
| * | Fix the behaviour of sql classes regarding quoted identifiersBill King2009-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no quotes around identifiers are provided by the programmer, identifiers are treated identically to how the underlying engine would behave. i.e. some engines uppercase the identifiers others lowercase them. If the programmer wants case sensitivty and/or use whitespaces they will need to quote their identifiers. The previous (incorrect) behaviour always quoted the identifiers. Originally committed to 4.5, but removed due to BC concerns, this is a reintegration into mainline for inclusion in 4.6 Reviewed-by: Bill King
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-172-4/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * | Update license headers in files that are new in 4.6.Jason McDonald2009-06-172-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-161-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
| * | Fix build error on Mac (Cocoa 64)Prasanth Ullattil2009-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Using QSQLLEN instead of SQLINTEGER, similar to the one used in qGetIntData(). Reviewed-by: Jens Bache-Wiig
| * | Stage 1 of incorporating database level precision policy.Bill King2009-06-151-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | Queries now ask the database object what precision they should be, allows for setting precision policies on sql models, where previously this was not available. Also fixes some failing precisionpolicy implementations, as well as working around the fact qstring can't convert from "123.00" to an int based type.
* | | Merge of masterBradley T. Hughes2009-06-151-28/+35
|/ /
* | improved string operations all over the placeThierry Bastian2009-05-281-12/+9
|/ | | | | used character operations whenever possible better usage of QLatin1String
* Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+0
| | | | Reviewed-by: nrc
* Apparently this is the best way to determine which to useBill King2009-05-011-5/+4
| | | | Best as I can determine via trial and error. It should make vc6 compile again though.