summaryrefslogtreecommitdiffstats
path: root/src/sql
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * bug fixDerick Hawcroft2009-06-301-0/+1
| | | | | | | | | | | | | | - case for QVariant::Bool in switch statement was missing Task-number: 215511 Reviewed-by: TrustMe
| * bug fixDerick Hawcroft2009-06-291-1/+4
| | | | | | | | | | Task-number: 217003 Reviewed-by: Bill King
* | 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
|/ /
* | improved string operations all over the placeThierry Bastian2009-05-2814-67/+55
|/ | | | | used character operations whenever possible better usage of QLatin1String
* 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
* Fixes a memory leak in the interbase sql driver.Bill King2009-05-201-4/+3
| | | | | | As suggested in gitorius merge request 421, solution supplied by Harald. Reviewed-by: Harald Fernengel
* Adds thread initialisation/cleanup code to mysql.Bill King2009-05-201-0/+8
| | | | | | Allows for cleaner multi-thread working for mysql clients. Task-number: 253407
* Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* Use newer safer error function if available.Bill King2009-05-141-2/+9
| | | | | | Uses fb_interpret instead of isc_interprete if using firebird. Closes a potential security hole/buffer overrun. Reviewed-by: Justin McPherson
* Fixes a segfault from out of order cleanup of mysql resources.Bill King2009-05-131-50/+73
| | | | | | | If a QSqlQuery survived the lifetime of removal of a mysql db connection (that failed), the cleanup code would cause a segfault because it was using an out of date pointer that was pointing at memory that'd been freed by the removeDatabase() call. Revby: Justin McPherson Task-number: 205701
* The description cited MySQL and the code is for PostgreSQL.Benjamin Poulain2009-05-121-1/+1
| | | | | Task-number: 253427 Reviewed-by: TrustMe
* Fixes QIBASE driver crashes on multiple execution of a prepared queryBill King2009-05-071-3/+3
| | | | Task-number: 246808
* Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+0
| | | | Reviewed-by: nrc
* Fixes crash when mysql_init() returns 0Bill King2009-05-051-1/+1
| | | | Task-number: 250632
* 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.
* Try and clean up ODBC 64/32 bit type disparityBill King2009-04-291-6/+4
| | | | It seems that after approx version 2.7.0, microsoft changed the ODBC types of certain functions, to cater for 64bit architectures. This tries to be a little bit smarter about which types are used in which places.
* Fixes performance degradation from precision fix in 4.5.1Bill King2009-04-291-20/+20
| | | | | | | Alleviates the performance hit of querying the database except when necessary, try and use XSQLVAR as much as possible, except for floating point fields. Task-number: 252426
* Fixes over-verboseness in OCI tables function.Bill King2009-04-191-2/+2
| | | | | Differring case of username shouldn't mean adding the username on front. Also fixes autotest failures.
* Fixes long strings getting truncated by the ODBC Driver.Bill King2009-04-161-1/+1
| | | | | | | This test has always been wrong/confusing. Fix it to work, and make sense. Task-number: 250026 Revby: Lincoln Ramsay
* Fixes an issue with FreeTDS and quoting.Bill King2009-04-151-0/+5
| | | | | | | Microsofts SQL Server odbc driver calls SET QUOTED_IDENTIFIER_ON, but freetds doesn't, so any quoting fails. This fixes that issue. Reviewed-by: abcd
* Fix the behaviour of sql classes regarding quoted identifiersabcd2009-04-1515-81/+537
| | | | | | | | | | | 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. Reviewed-by: Bill King