summaryrefslogtreecommitdiffstats
path: root/src/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-041-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Merge branch '4.5'Thiago Macieira2009-08-031-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * Fixes hack around show queries not allowed to be prepared.Bill King2009-07-301-3/+3
| | | | | | | | | | | | | | | | | | | | | Mysql queries other than select can't be prepared, otherwise they fail to return the necessary meta-information to enable them to be seen as returning data under certain versions of mysql. This fixes the hack to work correctly until we stop preparing queries automagically.
| | * Fixed compile on certain Solaris versions.Rohan McGovern2009-07-201-1/+1
| | | | | | | | | | | | | | | Every source file must end with a newline, otherwise: "Error: There is extra text on this line."
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | Fixes various db2 autotest issues.Bill King2009-07-291-1/+3
| | |
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-277-70/+91
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | Fix compilation for db2 driver after win9x removal spreeBill King2009-07-201-0/+2
| | |
| * | Doc: add \since 4.6 for new APIsVolker Hilsheimer2009-07-192-20/+34
| | |
| * | Fix (some) spelling and grammatical errors in translatable strings.Volker Hilsheimer2009-07-162-3/+3
| | | | | | | | | | | | | | | | | | | | | Requires an update of existing translations. Fixes: 247314 Reviewed-by: TrustMe
| * | Merge commit 'origin/4.5'Bill King2009-07-132-15/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
| | * Fixes failure when table has null fields to updateBill King2009-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes an issue where too many parameters are bound when updating QSqlTableModel where the stored record has NULLs in it. Reviewed-by: Justin McPherson
| | * emit dataChanged() signalDerick Hawcroft2009-07-091-0/+1
| | | | | | | | | | | | Task-number:207874
| | * Plugged possible memory leak in getPSQLVersion()Stian Sandvik Thomassen2009-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | Call PQclear() regardless of the status of the result returned by PQexec(). Reviewed-by: Bill King
| | * Hopefully fix isnan/isinf for good (for all platforms)Bill King2009-07-081-12/+20
| | |
| * | Fixes merge mixup.Bill King2009-07-121-2/+2
| | |
| * | 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 commit 'origin/4.5'Bill King2009-07-083-7/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| | * Fixes Dericks inf/nan patch for msvcBill King2009-07-081-0/+13
| | |
| | * remove debugDerick Hawcroft2009-07-071-1/+0
| | |
| | * 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
generated by cgit v0.12 at 2025-01-27 07:04:59 (GMT)