diff --git a/src/server/cachecleaner.cpp b/src/server/cachecleaner.cpp --- a/src/server/cachecleaner.cpp +++ b/src/server/cachecleaner.cpp @@ -122,7 +122,7 @@ qb.addJoin(QueryBuilder::InnerJoin, PimItem::tableName(), Part::pimItemIdColumn(), PimItem::idFullColumnName()); qb.addJoin(QueryBuilder::InnerJoin, PartType::tableName(), Part::partTypeIdFullColumnName(), PartType::idFullColumnName()); qb.addValueCondition(PimItem::collectionIdFullColumnName(), Query::Equals, collection.id()); - qb.addValueCondition(PimItem::atimeFullColumnName(), Query::Less, QDateTime::currentDateTime().addSecs(-60 * collection.cachePolicyCacheTimeout())); + qb.addValueCondition(PimItem::atimeFullColumnName(), Query::Less, QDateTime::currentDateTimeUtc().addSecs(-60 * collection.cachePolicyCacheTimeout())); qb.addValueCondition(Part::dataFullColumnName(), Query::IsNot, QVariant()); qb.addValueCondition(PartType::nsFullColumnName(), Query::Equals, QLatin1String("PLD")); qb.addValueCondition(PimItem::dirtyFullColumnName(), Query::Equals, false); diff --git a/src/server/handler/akappend.cpp b/src/server/handler/akappend.cpp --- a/src/server/handler/akappend.cpp +++ b/src/server/handler/akappend.cpp @@ -74,7 +74,7 @@ } item.setRemoteRevision(cmd.remoteRevision()); item.setGid(cmd.gid()); - item.setAtime(QDateTime::currentDateTime()); + item.setAtime(QDateTime::currentDateTimeUtc()); return true; } @@ -284,7 +284,7 @@ if (needsUpdate) { currentItem.setRev(qMax(newItem.rev(), currentItem.rev()) + 1); - currentItem.setAtime(QDateTime::currentDateTime()); + currentItem.setAtime(QDateTime::currentDateTimeUtc()); // Only mark dirty when merged from application currentItem.setDirty(!connection()->context()->resource().isValid()); diff --git a/src/server/handler/copy.cpp b/src/server/handler/copy.cpp --- a/src/server/handler/copy.cpp +++ b/src/server/handler/copy.cpp @@ -39,8 +39,8 @@ PimItem newItem = item; newItem.setId(-1); newItem.setRev(0); - newItem.setDatetime(QDateTime::currentDateTime()); - newItem.setAtime(QDateTime::currentDateTime()); + newItem.setDatetime(QDateTime::currentDateTimeUtc()); + newItem.setAtime(QDateTime::currentDateTimeUtc()); newItem.setRemoteId(QString()); newItem.setRemoteRevision(QString()); newItem.setCollectionId(target.id()); @@ -55,7 +55,7 @@ } DataStore *store = connection()->storageBackend(); - if (!store->appendPimItem(parts, item.flags(), item.mimeType(), target, QDateTime::currentDateTime(), QString(), QString(), item.gid(), newItem)) { + if (!store->appendPimItem(parts, item.flags(), item.mimeType(), target, QDateTime::currentDateTimeUtc(), QString(), QString(), item.gid(), newItem)) { return false; } diff --git a/src/server/handler/move.cpp b/src/server/handler/move.cpp --- a/src/server/handler/move.cpp +++ b/src/server/handler/move.cpp @@ -41,7 +41,7 @@ ItemQueryHelper::itemSetToQuery(ImapSet(ids), qb); qb.addValueCondition(PimItem::collectionIdFullColumnName(), Query::NotEquals, mDestination.id()); - const QDateTime mtime = QDateTime::currentDateTime(); + const QDateTime mtime = QDateTime::currentDateTimeUtc(); if (!qb.exec()) { failureResponse("Unable to execute query"); diff --git a/src/server/storage/akonadidb.xml b/src/server/storage/akonadidb.xml --- a/src/server/storage/akonadidb.xml +++ b/src/server/storage/akonadidb.xml @@ -130,10 +130,10 @@ - + create/modified time - + read access time diff --git a/src/server/storage/datastore.cpp b/src/server/storage/datastore.cpp --- a/src/server/storage/datastore.cpp +++ b/src/server/storage/datastore.cpp @@ -872,7 +872,7 @@ qb.addValueCondition(PimItem::collectionIdColumn(), Query::Equals, collection.id()); qb.setColumnValue(PimItem::remoteIdColumn(), QVariant()); qb.setColumnValue(PimItem::remoteRevisionColumn(), QVariant()); - const QDateTime now = QDateTime::currentDateTime(); + const QDateTime now = QDateTime::currentDateTimeUtc(); qb.setColumnValue(PimItem::datetimeColumn(), now); qb.setColumnValue(PimItem::atimeColumn(), now); qb.setColumnValue(PimItem::dirtyColumn(), true); @@ -1065,7 +1065,7 @@ } pimItem.setRemoteRevision(remoteRevision); pimItem.setGid(gid); - pimItem.setAtime(QDateTime::currentDateTime()); + pimItem.setAtime(QDateTime::currentDateTimeUtc()); if (!pimItem.insert()) { return false; diff --git a/src/server/storage/dbinitializer.cpp b/src/server/storage/dbinitializer.cpp --- a/src/server/storage/dbinitializer.cpp +++ b/src/server/storage/dbinitializer.cpp @@ -314,7 +314,7 @@ QString DbInitializer::sqlValue(const ColumnDescription &col, const QString &value) const { - if (col.type == QLatin1String("QDateTime") && value == QLatin1String("QDateTime::currentDateTime()")) { + if (col.type == QLatin1String("QDateTime") && value == QLatin1String("QDateTime::currentDateTimeUtc()")) { return QStringLiteral("CURRENT_TIMESTAMP"); } else if (col.isEnum) { return QString::number(col.enumValueMap[value]);