← Back to branch summary

~ubuntu-branches/ubuntu/vivid/akonadi/vivid-proposed

~ubuntu-branches/ubuntu/vivid/akonadi/vivid-proposed

« back to all changes in this revision

Viewing changes to server/src/storage/querybuilder.h

Committer: Package Import Robot
Author(s): Scarlett Clark
Date: 2014-07-18 15:38:49 UTC
mfrom: (1.1.52)
Revision ID: package-import@ubuntu.com-20140718153849-mrt24e3jsxxikq7m

Tags: 1.12.91-0ubuntu1

* New upstream release needed for KDE 4.13.90 beta 2
* Remove patches applied upstream.
* Update symbols with batchpatch.

files added:
server/src/collectionreferencemanager.cpp

server/src/collectionreferencemanager.h

server/src/commandcontext.cpp

server/src/commandcontext.h

server/src/connectionthread.cpp

server/src/connectionthread.h

server/src/handler/merge.cpp

server/src/handler/merge.h

server/src/storage/partstreamer.cpp

server/src/storage/partstreamer.h

server/tests/unittest/akappendhandlertest.cpp

server/tests/unittest/collectionreferencetest.cpp

server/tests/unittest/createhandlertest.cpp

server/tests/unittest/dbpopulator.h

server/tests/unittest/dbpopulator.xsl

server/tests/unittest/dbtest_data

server/tests/unittest/dbtest_data/dbdata.xml

server/tests/unittest/dbtest_data/dbinit_mysql

server/tests/unittest/dbtest_data/dbinit_mysql_incremental

server/tests/unittest/dbtest_data/dbinit_psql

server/tests/unittest/dbtest_data/dbinit_psql_incremental

server/tests/unittest/dbtest_data/dbinit_sqlite

server/tests/unittest/dbtest_data/dbinit_sqlite_incremental

server/tests/unittest/dbtest_data/dbtest_data.qrc

server/tests/unittest/dbtest_data/unittest_dbupdate.xml

server/tests/unittest/dbtest_data/unittest_schema.xml

server/tests/unittest/fakeakonadiserver.cpp

server/tests/unittest/fakeakonadiserver.h

server/tests/unittest/fakeclient.cpp

server/tests/unittest/fakeclient.h

server/tests/unittest/fakeconnection.cpp

server/tests/unittest/fakeconnection.h

server/tests/unittest/fakedatastore.cpp

server/tests/unittest/fakedatastore.h

server/tests/unittest/fakeentities.h

server/tests/unittest/fakesearchmanager.cpp

server/tests/unittest/fakesearchmanager.h

server/tests/unittest/linkhandlertest.cpp

server/tests/unittest/listhandlertest.cpp

server/tests/unittest/modifyhandlertest.cpp

server/tests/unittest/partstreamertest.cpp

files removed:
.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler

.pc/upstream_1.12-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage

.pc/upstream_1.12-Remove-the-invalid-GID-part-from-PartTable-before-st.patch/server/src/storage/dbupdater.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/CMakeLists.txt

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/handler/fetchhelper.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/dbusconnectionpool.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/nepomuk/queryserviceclient.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/agentsearchinstance.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/search/searchtaskmanager.h

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storage/itemretrievalmanager.cpp

.pc/upstream_1.12-Use-per-thread-QDBusConnections.patch/server/src/storagejanitor.cpp

server/tests/unittest/dbinitializertest_data

server/tests/unittest/dbinitializertest_data/dbinit_mysql

server/tests/unittest/dbinitializertest_data/dbinit_mysql_incremental

server/tests/unittest/dbinitializertest_data/dbinit_psql

server/tests/unittest/dbinitializertest_data/dbinit_psql_incremental

server/tests/unittest/dbinitializertest_data/dbinit_sqlite

server/tests/unittest/dbinitializertest_data/dbinit_sqlite_incremental

server/tests/unittest/dbinitializertest_data/dbinitializertestdata.qrc

server/tests/unittest/dbinitializertest_data/unittest_dbupdate.xml

server/tests/unittest/dbinitializertest_data/unittest_schema.xml

files modified:
.pc/applied-patches

CMakeLists.txt

Mainpage.dox

NEWS

cmake/modules/FindSqlite.cmake

debian/changelog

debian/libakonadiprotocolinternals1.symbols

debian/patches/series

libs/CMakeLists.txt

libs/notificationmessagev2.cpp

libs/notificationmessagev2_p.h

libs/notificationmessagev2_p_p.h

libs/notificationmessagev3.cpp

libs/notificationmessagev3_p.h

libs/protocol_p.h

libs/tests/imapparserbenchmark.cpp

libs/xdgbasedirs.cpp

qsqlite/src/qsql_sqlite.cpp

qsqlite/src/sqlite_blocking.cpp

qsqlite/src/sqlite_blocking.h

server/CMakeLists.txt

server/src/akonadi.cpp

server/src/akonadi.h

server/src/cachecleaner.cpp

server/src/cachecleaner.h

server/src/clientcapabilities.cpp

server/src/clientcapabilities.h

server/src/collectionscheduler.cpp

server/src/connection.cpp

server/src/connection.h

server/src/handler.cpp

server/src/handler/akappend.cpp

server/src/handler/akappend.h

server/src/handler/append.cpp

server/src/handler/capability.cpp

server/src/handler/capability.h

server/src/handler/copy.cpp

server/src/handler/create.cpp

server/src/handler/delete.cpp

server/src/handler/fetch.cpp

server/src/handler/fetchhelper.cpp

server/src/handler/fetchhelper.h

server/src/handler/fetchscope.cpp

server/src/handler/fetchscope.h

server/src/handler/link.cpp

server/src/handler/list.cpp

server/src/handler/list.h

server/src/handler/modify.cpp

server/src/handler/modify.h

server/src/handler/move.cpp

server/src/handler/remove.cpp

server/src/handler/resourceselect.cpp

server/src/handler/scope.cpp

server/src/handler/scope.h

server/src/handler/searchpersistent.cpp

server/src/handler/searchresult.cpp

server/src/handler/select.cpp

server/src/handler/store.cpp

server/src/handler/store.h

server/src/handler/subscribe.cpp

server/src/handler/tagappend.cpp

server/src/handler/tagfetchhelper.cpp

server/src/handlerhelper.cpp

server/src/handlerhelper.h

server/src/imapstreamparser.cpp

server/src/imapstreamparser.h

server/src/intervalcheck.cpp

server/src/intervalcheck.h

server/src/main.cpp

server/src/notificationmanager.cpp

server/src/notificationmanager.h

server/src/notificationsource.cpp

server/src/notificationsource.h

server/src/preprocessormanager.cpp

server/src/response.cpp

server/src/response.h

server/src/search/searchmanager.cpp

server/src/search/searchmanager.h

server/src/search/searchtaskmanager.cpp

server/src/storage/akonadidb.xml

server/src/storage/collectionqueryhelper.cpp

server/src/storage/datastore.cpp

server/src/storage/datastore.h

server/src/storage/dbconfigmysql.cpp

server/src/storage/dbconfigpostgresql.cpp

server/src/storage/dbconfigsqlite.cpp

server/src/storage/dbinitializer.cpp

server/src/storage/dbinitializer_p.cpp

server/src/storage/dbtype.cpp

server/src/storage/dbtype.h

server/src/storage/dbupdate.xml

server/src/storage/entities-source.xsl

server/src/storage/entities.xsl

server/src/storage/entity.h

server/src/storage/itemqueryhelper.cpp

server/src/storage/itemqueryhelper.h

server/src/storage/itemretriever.cpp

server/src/storage/notificationcollector.cpp

server/src/storage/parthelper.cpp

server/src/storage/parthelper.h

server/src/storage/parttypehelper.cpp

server/src/storage/parttypehelper.h

server/src/storage/querybuilder.cpp

server/src/storage/querybuilder.h

server/src/storage/queryhelper.cpp

server/src/storagejanitor.cpp

server/src/storagejanitor.h

server/src/utils.cpp

server/src/utils.h

server/tests/unittest/CMakeLists.txt

shared/akapplication.cpp

shared/akapplication.h

shared/aktest.h

Show diffs side-by-side

added added

removed removed

server/src/storage/querybuilder.h

244

244

*/

245

245

void sqliteAdaptUpdateJoin( Query::Condition &cond );

246

246

247

bool retryLastTransaction();

247

bool retryLastTransaction( bool rollback = false);

248

248

249

249

private:

250

250

QString mTable;

Older »