summaryrefslogtreecommitdiffstats
path: root/src/sql/models
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2910-240/+240
| | | | | | | | 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>
* documentation: grammar nitpickMark Brand2012-08-311-3/+3
| | | | | | | | | | Cherry-picked from qt5/qtbase 4692432b61b09f010a3a7e57e80b9599686fe438 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> Change-Id: I1944946b5f17bbf69005d2da30cedff4970f9827 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0110-20/+20
| | | | | | | | | | | | | - 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>
* Doc: Fix typo foreigh -> foreignSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23260 Change-Id: I7d9ff3a23e1f20df5883d7c932a51c582945685c Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QSqlTM: respect generated flag in insertRecord() and setRecord()Mark Brand2012-07-131-1/+4
| | | | | | | | | | | | | | | | These methods failed to respect the setting of the generated flag on the fields of source record. INSERT and UPDATE statements should only include fields where generated is TRUE. Test included. Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440. Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427 Task-number: QTBUG-23592 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QSqlQueryModel::fetchMore() documentation fixMark Brand2012-04-241-1/+1
| | | | | | | Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad Reviewed-by: Andy Shaw <andy.shaw@digia.com> cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1110-10/+10
| | | | | | | | | 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>
* QSqlRelationalTableModel doesn't follow relations on the first columnHonglei Zhang2011-12-051-1/+1
| | | | | | | | | QSqlRelationalTableModel doesn't follow relations on the first column of a table. The DisplayRole and the EditRole for indexes on column 0 are always the same. The bug is found in QSqlRelationalTableModel::data. Task-number: QTBUG-20038 Reviewed-by: Charles Yin
* Doc: Fixed qdoc warnings.David Boddie2011-08-151-9/+17
|
* Doc: Fixed qdoc warnings.David Boddie2011-08-151-2/+2
|
* Make it possible to update a related table after an external updateAndy Shaw2011-07-261-2/+34
| | | | | | | | | | | | | | | | When a table that is related to in a QSqlRelationalTableModel gets updated in some way (e.g. a new row, or the data is changed) then the related model could not be updated without recreating the QSqlRelationalTableModel. Now, to get around this, select() can be called on the related model to get it to be updated. Task-number: QTBUG-7885 Reviewed-by: Charles Yin Reviewed-by: Michael Goddard Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca
* Add docs for QSqlRelationalTableModel::JoinModeCharles Yin2011-07-191-0/+12
| | | | | | | Task-number:QTBUG-8217 Reviewed-by:Michael Goddard Change-Id: Ie2af750c3a64aa634e11617cf9b3f9e7bdcf3a5f
* Fixed behavior on NULL foreign keysDaNiMoTh2011-07-192-12/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a simple INNER JOIN, like: SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing = table2.smthing) which doesn't show row where foreign keys are NULL, allow use of LEFT JOIN like: SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing = table2.smthing The trick works also for multi-relational tables. Just remember to use the new API setJoinMode. Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com> Change-Id: I349f9418e4859923977942add59872b000cac2c5 Task-number:QTBUG-8217 Reviewed-by:Michael Goddard Reviewed-by:Charles Yin Merge-request: 2576 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2410-170/+170
|\ | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1310-170/+170
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Doc: Documented the value returned when no field can be found.David Boddie2011-05-111-1/+2
|/ | | | Task-number: QTBUG-19115
* let generated flag control SQL generationMark Brand2011-03-293-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if QSqlField's QVariant value had type "invalid", this caused the field to be omitted in data-changing SQL statements generated from QSqlRecord edit buffers. Complaints against this mechanism: - It precludes initializing value type to field type, which would otherwise seem sensible and useful, such as when using model.data() in contexts where the field type is not readily available. - QSqlField::clear() does initialize value type to match field type and so is incompatible with this mechanism. - Problems such as described in QTBUG-13211. - Unwanted distinction between "invalid" and "null" when mapping field values to SQL values. - QSqlField's generated flag already provides a mechanism for controlling SQL generation. These complaints are redressed here by replacing this mechanism with reliance on QSqlField's generated flag. The flag is initialized to false in new edit records and set to true when a value is set. Applications can still manipulate generated flags directly to control SQL generation. Generation of SELECT statements already used the generated flag and is unaffected by this change. Merge-request: 1114 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard
* Fix an issue with removing rows in a table model.Michael Goddard2011-02-182-3/+3
| | | | | | | | | | Tables with nulls in a row were not being deleted properly in some cases. Made sure the responsible function no longer has default parameters so this doesn't happen again. Change-Id: I479121172d5ac172ca49da78638b9353d7a67548 Task-number: QTBUG-16007, QTBUG-15979 Reviewed-by: Charles Yin
* Fix some removeRows issues with QSqlTableModel.Michael Goddard2011-02-041-2/+5
| | | | | | | | Added some better unit testing around the problem areas. Change-Id: Ie4749da298aebbae6aec9558ebe8c8f2196c705f Task-number: QTBUG-14916 Reviewed-by: Charles Yin
* Try to document that invalid database arguments use the default database.Michael Goddard2011-02-041-1/+2
| | | | | | | | Some places documented this, some didn't. Change-Id: Id66678dbcd9af6ec9687db745ba6f5506e951d1d Task-number: QTBUG-3240 Reviewed-by: Charles Yin
* Update some documentation about what happens with select()/setQuery().Michael Goddard2011-02-042-0/+4
| | | | | | Change-Id: I5f1afada766d40273526f2cd7537ad68d5f9d09a Task-number: QTBUG-12094 Reviewed-by: Charles Yin
* Make sure that setRecord emits dataChanged() with OnManualSubmit.Michael Goddard2011-02-041-0/+3
| | | | | | | | | Since the change is immediately visible through data(), this is needed so that QSortFilterProxyModel etc work correctly. Change-Id: Ied7afce2e6a1f516b502d3501f9d214df54e52f2 Task-number: QTBUG-14831 Reviewed-by: Charles Yin
* QSqlTableModel/QSqlQueryModel and insertColumns problem.Michael Goddard2011-02-042-3/+13
| | | | | | | | | | | | | | After inserting a column, fetching data through QSqlTableModel was off by one or more, since it passed the indexInQuery through to QSQM. Also, the headerData would sometimes return a blank string for an inserted column, and sometimes the column number. The autotests have been beefed up a little to check insertRows and insertColumns play nicely. Change-Id: I7399d4c4d94f958884b67ab9b39b5cf2485d8416 Task-number: QTBUG-12626 Reviewed-by: Charles Yin
* Update copyright year to 2011.Jason McDonald2011-01-1010-10/+10
| | | | Reviewed-by: Trust Me
* Docs: QTBUG-9150 Incorrect snippet in class doc.Peter Yard2010-12-221-1/+1
|
* silence compiler warningsHarald Fernengel2010-11-191-5/+5
| | | | Silence shadowing warnings from gcc.
* Update copyright year to 2010Jason McDonald2010-01-0610-10/+10
| | | | Reviewed-by: Trust Me
* Fixed QSqlRelationalTableModel doesn't correctly work with relation in other ↵Bill King2009-11-301-1/+1
| | | | | | | | | | database schema PSQL doesn't like having schema scoping in "AS" aliasing of fields, so use everything after the last "." separator for generating the alias. Task-number: QTBUG-5373 Reviewed-by: Justin McPherson
* Don't reset view if a query fails.Derick Hawcroft2009-11-091-4/+5
| | | | | | | | The view of a table gets reset if for example a query fails. However this also resets and removes the Header views of the table. A better solution visually is to keep them displayed. Task-number: QTBUG-3162
* Merge branch '4.5' into 4.6Morten Johan Sørvig2009-11-051-1/+1
|\ | | | | | | | | | | Conflicts: tests/auto/qsqlquery/tst_qsqlquery.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Check success of query.Derick Hawcroft2009-11-051-1/+1
| | | | | | | | | | | | | | For example a bogus use of setFilter() might cause a query to fail. Check for this. Reviewed-by: Bill King
* | Fixed crash when setting header data in QSqlQueryModel.Gabriel de Dietrich2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash (Q_ASSERT_X failure) happened when a proxy model was being attached to the QSqlQueryModel, and no query was set yet. The headerDataChanged() signal was being received by the proxy model who wouldn't check its "proxyfied" data bounds. The patch introduces a behaviour change. However, this change makes the usage of QSqlQueryModel::setHeaderData() to be more in accordance with the current documentation, and to behave in the same way as for QStandardItemModel, QTreeModel, and QTableModel. Task-number: QTBUG-4963 Reviewed-by: Olivier
* | Fixes issue with multiple lookups to same table/fieldBill King2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | Previously the renaming scheme created a new table_field alias name. If multiple references referred to the same table/field lookup, then multiples of the same alias would be generated in the query, leading the query to fail. Reviewed-by: Justin McPherson
* | Merge commit 'origin/4.5' into 4.6Bill King2009-09-141-4/+5
|\ \ | |/
| * Fixes QSqlTableModel: trying to delete the wrong row.Bill King2009-09-141-4/+5
| | | | | | | | | | | | | | Uses the primary key from the index in the query, not the resulting location in the modified dataset. Task-number: 222678
| * Update license headers again.Jason McDonald2009-09-0810-40/+40
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers again.Jason McDonald2009-09-0910-40/+40
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3110-130/+130
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3110-130/+130
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1110-10/+10
| | | | | | | | Reviewed-by: Trust Me
* | Update contact URL in license headers.Jason McDonald2009-08-1210-10/+10
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bill King2009-07-131-1/+2
|\ \ | |/ | | | | | | | | | | | | 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
* | Fix the behaviour of sql classes regarding quoted identifiersBill King2009-06-221-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-169-31/+25
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1610-20/+20
| | | | | | | | Reviewed-by: Trust Me
| * BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"Bill King2009-06-152-65/+28
| | | | | | | | | | This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3 due to forward binary compatibility issues in a point release.
* | improved string operations all over the placeThierry Bastian2009-05-281-1/+1
|/ | | | | used character operations whenever possible better usage of QLatin1String
generated by cgit v0.12 at 2025-02-13 04:30:08 (GMT)