summaryrefslogtreecommitdiffstats
path: root/common/genericresource.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-01 15:18:13 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-01 15:18:13 +0100
commit9809045a2a71cf509857a762fac62e81c25de856 (patch)
treeb74270913a41f9d9f3d243f7c8cc127dbe0e3c00 /common/genericresource.cpp
parent4aa007e5cf59288e7d548ea3f613a10ac0a6057e (diff)
downloadsink-9809045a2a71cf509857a762fac62e81c25de856.tar.gz
sink-9809045a2a71cf509857a762fac62e81c25de856.zip
Centralized main database name
Diffstat (limited to 'common/genericresource.cpp')
-rw-r--r--common/genericresource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 1e45243..a9eab36 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -87,7 +87,7 @@ public Q_SLOTS:
87 const auto uid = Storage::getUidFromRevision(mainStoreTransaction, revision); 87 const auto uid = Storage::getUidFromRevision(mainStoreTransaction, revision);
88 const auto type = Storage::getTypeFromRevision(mainStoreTransaction, revision); 88 const auto type = Storage::getTypeFromRevision(mainStoreTransaction, revision);
89 const auto key = Storage::assembleKey(uid, revision); 89 const auto key = Storage::assembleKey(uid, revision);
90 mainStoreTransaction.openDatabase(type + ".main").scan(key, [&lastReplayedRevision, type, this](const QByteArray &key, const QByteArray &value) -> bool { 90 Storage::mainDatabase(mainStoreTransaction, type).scan(key, [&lastReplayedRevision, type, this](const QByteArray &key, const QByteArray &value) -> bool {
91 mReplayFunction(type, key, value).exec(); 91 mReplayFunction(type, key, value).exec();
92 //TODO make for loop async, and pass to async replay function together with type 92 //TODO make for loop async, and pass to async replay function together with type
93 Trace() << "Replaying " << key; 93 Trace() << "Replaying " << key;
@@ -632,7 +632,7 @@ static QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> getLatest(const Si
632 632
633void GenericResource::createOrModify(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity) 633void GenericResource::createOrModify(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity)
634{ 634{
635 auto mainDatabase = transaction.openDatabase(bufferType + ".main"); 635 auto mainDatabase = Storage::mainDatabase(transaction, bufferType);
636 const auto sinkId = resolveRemoteId(bufferType, remoteId, synchronizationTransaction); 636 const auto sinkId = resolveRemoteId(bufferType, remoteId, synchronizationTransaction);
637 const auto found = mainDatabase.contains(sinkId); 637 const auto found = mainDatabase.contains(sinkId);
638 if (!found) { 638 if (!found) {