summaryrefslogtreecommitdiffstats
path: root/src/sql
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Handle special number cases (nan,{+-}infinity) in PostgreSQLDerick Hawcroft2009-07-071-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | When contructing the EXECUTE statement, there is a special case that we need to handle whereby we explicitly put quotes around the special float values before submutting the statement for execution Task-number:233829 Reviewed-by: Bill King
| * | Merge branch '4.5'Thiago Macieira2009-07-022-3/+8
| |\ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-07-021-1/+1
| |\ \ \
| * | | | src/sql: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-012-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-1/+5
| |\ \ \ \
* | \ \ \ \ Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-095-12/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-074-11/+17
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * | | | | Handle all PostgreSQL notifications sitting in the queueDerick Hawcroft2009-07-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 257247 Reviewed-by: trustme
| | * | | | | Fixes ::record for dialect 3 named tables in interbase/firebird.Bill King2009-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comparison was mistakenly only uppercasing one side, so mixed case table names were reporting back as if they weren't found for both QSqlDatabase::record() and QSqlDatabase::primaryIndex()
| | * | | | | Fixes invalid length for numeric fields in oracle.Bill King2009-07-031-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | When the precisionpolicy is high, and the field is numeric, it was getting confused as a string field and pulling the wrong length value.
| | * | | | 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.
| | * | | | Get more autotests passing/fixed up.Bill King2009-07-021-2/+5
| | | |_|/ | | |/| |
| | * | | 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
| | * | bug fixDerick Hawcroft2009-06-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - case for QVariant::Bool in switch statement was missing Task-number: 215511 Reviewed-by: TrustMe
| * | | Removed unused static data from Qt.axis2009-07-061-2/+0
| | | | | | | | | | | | | | | | This saves memory and prevents warnings from RVCT.
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2950-680/+243
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| | * | bug fixDerick Hawcroft2009-06-291-1/+4
| | | | | | | | | | | | | | | | | | | | Task-number: 217003 Reviewed-by: Bill King
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3050-403/+542
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-3/+3
| |\ \ \
| | * \ \ Merge branch '4.5'Thiago Macieira2009-06-252-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
| | | * | save on a couple of mallocsDerick Hawcroft2009-06-241-1/+1
| | | | |
| | | * | Fixup ibase.Derick Hawcroft2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | delete -> delete []
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-251-16/+36
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.5'Thiago Macieira2009-06-241-16/+36
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | | * | bug fix for ibase sql driverDerick Hawcroft2009-06-241-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add checks for failed malloc's - convert some of the obvious malloc'ed stuff to use new/delete Task-number: 200217 Reviewed-by: Bill King
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-242-27/+22
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| | * | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-27/+22
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | 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
| | | * | task 226042Derick Hawcroft2009-06-221-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until the PostgreSQL API has this functionality. Use a hack to find out if a transaction has failed or not. This hack is a limited to 8.x versions of PostgreSQL. Bill King
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2213-48/+210
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-227-33/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Stage 3 of incorporating database level precision policy.Bill King2009-06-211-10/+11
| | | | | | | | | | | | | | | | | | | | DB2 is now tested and working, which completes the drivers.
| | * | | Stage 2 of incorporating database level precision policy.Bill King2009-06-218-5/+56
| | | | | | | | | | | | | | | | | | | | All autotests pass now for all databases except DB2 (untested).
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1750-242/+133
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-1711-22/+22
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1639-220/+111
| | |\ \ \ | | | |/ /
| | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1650-100/+100
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"Bill King2009-06-1515-536/+81
| | | | | | | | | | | | | | | | | | | | | | | | | 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-163-19/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | doc: Fixed several qdoc errors.Martin Smith2009-06-162-10/+8
| | | | |
| | * | | 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-1515-238/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1515-238/+311
| |/ / /
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2514-67/+55
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | improved string operations all over the placeThierry Bastian2009-05-2814-67/+55
| |/ | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-252-3/+12
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/io/qfile.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp
| * Fixes one of the fields of mysql bound params not initialised.Bill King2009-05-211-2/+1
| | | | | | | | | | | | Found by valgrind, value isn't set but is used, fixes this. Reviewed-by: Justin McPherson
| * Fixes conditional jump on uninitialised valueBill King2009-05-211-1/+11
| | | | | | | | | | | | As found by valgrind. Also add error reporting that was missing. Reviewed-by: Justin McPherson