diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index 6698f03ac2..574fe1cce9 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -638,14 +638,14 @@ bool SyncJournalDb::checkConnect() } const auto deleteDownloadInfo = _queryManager.get(PreparedSqlQueryManager::DeleteDownloadInfoQuery, QByteArrayLiteral("DELETE FROM downloadinfo WHERE path=?1"), _db); if (!deleteDownloadInfo) { - qCDebug(lcDb) << "database error:" << deleteDownloadInfo->error(); + qCWarning(lcDb) << "database error:" << deleteDownloadInfo->error(); return sqlFail(QStringLiteral("prepare _deleteDownloadInfoQuery"), *deleteDownloadInfo); } const auto deleteUploadInfoQuery = _queryManager.get(PreparedSqlQueryManager::DeleteUploadInfoQuery, QByteArrayLiteral("DELETE FROM uploadinfo WHERE path=?1"), _db); if (!deleteUploadInfoQuery) { - qCDebug(lcDb) << "database error:" << deleteUploadInfoQuery->error(); + qCWarning(lcDb) << "database error:" << deleteUploadInfoQuery->error(); return sqlFail(QStringLiteral("prepare _deleteUploadInfoQuery"), *deleteUploadInfoQuery); } @@ -658,7 +658,7 @@ bool SyncJournalDb::checkConnect() } const auto getErrorBlacklistQuery = _queryManager.get(PreparedSqlQueryManager::GetErrorBlacklistQuery, sql, _db); if (!getErrorBlacklistQuery) { - qCDebug(lcDb) << "database error:" << getErrorBlacklistQuery->error(); + qCWarning(lcDb) << "database error:" << getErrorBlacklistQuery->error(); return sqlFail(QStringLiteral("prepare _getErrorBlacklistQuery"), *getErrorBlacklistQuery); } @@ -990,7 +990,7 @@ Result SyncJournalDb::setFileRecord(const SyncJournalFileRecord & "VALUES (?1 , ?2, ?3 , ?4 , ?5 , ?6 , ?7, ?8 , ?9 , ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17, ?18, ?19, ?20, ?21, ?22, ?23, ?24, ?25, ?26, ?27, ?28, ?29, ?30, ?31, ?32);"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return query->error(); } @@ -1028,7 +1028,7 @@ Result SyncJournalDb::setFileRecord(const SyncJournalFileRecord & query->bindValue(32, record._livePhotoFile); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return query->error(); } @@ -1087,21 +1087,21 @@ bool SyncJournalDb::listAllE2eeFoldersWithEncryptionStatusLessThan(const int sta QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE type == 2 AND isE2eEncrypted >= ?1 AND isE2eEncrypted < ?2 ORDER BY path||'/' ASC"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, SyncJournalFileRecord::EncryptionStatus::Encrypted); query->bindValue(2, status); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1156,7 +1156,7 @@ void SyncJournalDb::keyValueStoreSet(const QString &key, QVariant value) const auto query = _queryManager.get(PreparedSqlQueryManager::SetKeyValueStoreQuery, QByteArrayLiteral("INSERT OR REPLACE INTO key_value_store (key, value) VALUES(?1, ?2);"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } @@ -1164,7 +1164,7 @@ void SyncJournalDb::keyValueStoreSet(const QString &key, QVariant value) query->bindValue(2, value); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } } @@ -1178,7 +1178,7 @@ qint64 SyncJournalDb::keyValueStoreGetInt(const QString &key, qint64 defaultValu const auto query = _queryManager.get(PreparedSqlQueryManager::GetKeyValueStoreQuery, QByteArrayLiteral("SELECT value FROM key_value_store WHERE key=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return defaultValue; } @@ -1187,7 +1187,7 @@ qint64 SyncJournalDb::keyValueStoreGetInt(const QString &key, qint64 defaultValu auto result = query->next(); if (!result.ok || !result.hasData) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return defaultValue; } @@ -1198,13 +1198,13 @@ void SyncJournalDb::keyValueStoreDelete(const QString &key) { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteKeyValueStoreQuery, QByteArrayLiteral("DELETE FROM key_value_store WHERE key=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); qCWarning(lcDb) << "Failed to initOrReset _deleteKeyValueStoreQuery"; Q_ASSERT(false); } query->bindValue(1, key); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); qCWarning(lcDb) << "Failed to exec _deleteKeyValueStoreQuery for key" << key; Q_ASSERT(false); } @@ -1222,7 +1222,7 @@ bool SyncJournalDb::deleteFileRecord(const QString &filename, bool recursively) { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteFileRecordPhash, QByteArrayLiteral("DELETE FROM metadata WHERE phash=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1230,7 +1230,7 @@ bool SyncJournalDb::deleteFileRecord(const QString &filename, bool recursively) query->bindValue(1, phash); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } } @@ -1238,13 +1238,13 @@ bool SyncJournalDb::deleteFileRecord(const QString &filename, bool recursively) if (recursively) { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteFileRecordRecursively, QByteArrayLiteral("DELETE FROM metadata WHERE " IS_PREFIX_PATH_OF("?1", "path")), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, filename); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } } @@ -1276,14 +1276,14 @@ bool SyncJournalDb::getFileRecord(const QByteArray &filename, SyncJournalFileRec if (!filename.isEmpty()) { const auto query = _queryManager.get(PreparedSqlQueryManager::GetFileRecordQuery, QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE phash=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, getPHash(filename)); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); close(); return false; } @@ -1322,14 +1322,14 @@ bool SyncJournalDb::getFileRecordByE2eMangledName(const QString &mangledName, Sy if (!mangledName.isEmpty()) { const auto query = _queryManager.get(PreparedSqlQueryManager::GetFileRecordQueryByMangledName, QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE e2eMangledName=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, mangledName); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); close(); return false; } @@ -1367,20 +1367,20 @@ bool SyncJournalDb::getFileRecordByInode(quint64 inode, SyncJournalFileRecord *r const auto query = _queryManager.get(PreparedSqlQueryManager::GetFileRecordQueryByInode, QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE inode=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, inode); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } if (next.hasData) { @@ -1404,21 +1404,21 @@ bool SyncJournalDb::getFileRecordsByFileId(const QByteArray &fileId, const std:: const auto query = _queryManager.get(PreparedSqlQueryManager::GetFileRecordQueryByFileId, QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE fileid=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, fileId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1446,14 +1446,14 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio auto _exec = [&rowCallback](SqlQuery &query) { if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); return false; } forever { auto next = query.next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); return false; } if (!next.hasData) { @@ -1475,7 +1475,7 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio const auto query = _queryManager.get(PreparedSqlQueryManager::GetAllFilesQuery, QByteArrayLiteral(GET_FILE_RECORD_QUERY " ORDER BY path||'/' ASC"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } return _exec(*query); @@ -1492,7 +1492,7 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio " ORDER BY path||'/' ASC"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, path); @@ -1515,20 +1515,20 @@ bool SyncJournalDb::listFilesInPath(const QByteArray& path, const auto query = _queryManager.get(PreparedSqlQueryManager::ListFilesInPathQuery, QByteArrayLiteral(GET_FILE_RECORD_QUERY " WHERE parent_hash(path) = ?1 ORDER BY path||'/' ASC"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, getPHash(path)); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1588,14 +1588,14 @@ bool SyncJournalDb::updateFileRecordChecksum(const QString &filename, " WHERE phash == ?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } query->bindValue(1, phash); query->bindValue(2, contentChecksum); query->bindValue(3, checksumTypeId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1623,7 +1623,7 @@ bool SyncJournalDb::updateLocalMetadata(const QString &filename, " WHERE phash == ?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } @@ -1640,7 +1640,7 @@ bool SyncJournalDb::updateLocalMetadata(const QString &filename, query->bindValue(11, lockInfo._lockTimeout); query->bindValue(12, lockInfo._lockToken); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return false; } return true; @@ -1657,13 +1657,13 @@ Optional SyncJournalDb::hasHydratedOrDehyd " WHERE (" IS_PREFIX_PATH_OR_EQUAL("?1", "path") " OR ?1 == '');"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, filename); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } @@ -1671,7 +1671,7 @@ Optional SyncJournalDb::hasHydratedOrDehyd forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } if (!next.hasData) { @@ -1723,14 +1723,14 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString &file) if (checkConnect()) { const auto query = _queryManager.get(PreparedSqlQueryManager::GetDownloadInfoQuery, QByteArrayLiteral("SELECT tmpfile, etag, errorcount FROM downloadinfo WHERE path=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } query->bindValue(1, file); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } @@ -1756,7 +1756,7 @@ void SyncJournalDb::setDownloadInfo(const QString &file, const SyncJournalDb::Do "VALUES ( ?1 , ?2, ?3, ?4 )"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, file); @@ -1764,17 +1764,17 @@ void SyncJournalDb::setDownloadInfo(const QString &file, const SyncJournalDb::Do query->bindValue(3, i._etag); query->bindValue(4, i._errorCount); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } else { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteDownloadInfoQuery); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, file); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } } @@ -1793,7 +1793,7 @@ QVector SyncJournalDb::getAndDeleteStaleDownloadInf query.prepare("SELECT tmpfile, etag, errorcount, path FROM downloadinfo"); if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); return empty_result; } @@ -1813,7 +1813,7 @@ QVector SyncJournalDb::getAndDeleteStaleDownloadInf { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteDownloadInfoQuery); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return empty_result; } if (!deleteBatch(*query, superfluousPaths)) { @@ -1853,13 +1853,13 @@ SyncJournalDb::UploadInfo SyncJournalDb::getUploadInfo(const QString &file) "uploadinfo WHERE path=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } query->bindValue(1, file); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } @@ -1891,7 +1891,7 @@ void SyncJournalDb::setUploadInfo(const QString &file, const SyncJournalDb::Uplo "VALUES ( ?1 , ?2, ?3 , ?4 , ?5, ?6 , ?7 )"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } @@ -1904,20 +1904,20 @@ void SyncJournalDb::setUploadInfo(const QString &file, const SyncJournalDb::Uplo query->bindValue(7, i._contentChecksum); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } } else { const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteUploadInfoQuery); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, file); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } } @@ -1965,13 +1965,13 @@ SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry(const QString if (checkConnect()) { const auto query = _queryManager.get(PreparedSqlQueryManager::GetErrorBlacklistQuery); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } query->bindValue(1, file); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } @@ -2118,7 +2118,7 @@ void SyncJournalDb::setErrorBlacklistEntry(const SyncJournalErrorBlacklistRecord "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } @@ -2133,7 +2133,7 @@ void SyncJournalDb::setErrorBlacklistEntry(const SyncJournalErrorBlacklistRecord query->bindValue(9, item._errorCategory); query->bindValue(10, item._requestId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } } @@ -2203,21 +2203,21 @@ QStringList SyncJournalDb::getSelectiveSyncList(SyncJournalDb::SelectiveSyncList const auto query = _queryManager.get(PreparedSqlQueryManager::GetSelectiveSyncListQuery, QByteArrayLiteral("SELECT path FROM selectivesync WHERE type=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); *ok = false; return result; } query->bindValue(1, int(type)); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); *ok = false; return result; } forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); *ok = false; return result; } @@ -2349,12 +2349,12 @@ QByteArray SyncJournalDb::getChecksumType(int checksumTypeId) // Retrieve the id const auto query = _queryManager.get(PreparedSqlQueryManager::GetChecksumTypeQuery, QByteArrayLiteral("SELECT name FROM checksumtype WHERE id=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, checksumTypeId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return QByteArray(); } @@ -2379,12 +2379,12 @@ int SyncJournalDb::mapChecksumType(const QByteArray &checksumType) { const auto query = _queryManager.get(PreparedSqlQueryManager::InsertChecksumTypeQuery, QByteArrayLiteral("INSERT OR IGNORE INTO checksumtype (name) VALUES (?1)"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return 0; } query->bindValue(1, checksumType); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return 0; } } @@ -2393,12 +2393,12 @@ int SyncJournalDb::mapChecksumType(const QByteArray &checksumType) { const auto query = _queryManager.get(PreparedSqlQueryManager::GetChecksumTypeIdQuery, QByteArrayLiteral("SELECT id FROM checksumtype WHERE name=?1"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return 0; } query->bindValue(1, checksumType); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return 0; } @@ -2421,12 +2421,12 @@ QByteArray SyncJournalDb::dataFingerprint() const auto query = _queryManager.get(PreparedSqlQueryManager::GetDataFingerprintQuery, QByteArrayLiteral("SELECT fingerprint FROM datafingerprint"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return QByteArray(); } if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return QByteArray(); } @@ -2446,21 +2446,21 @@ void SyncJournalDb::setDataFingerprint(const QByteArray &dataFingerprint) const auto setDataFingerprintQuery1 = _queryManager.get(PreparedSqlQueryManager::SetDataFingerprintQuery1, QByteArrayLiteral("DELETE FROM datafingerprint;"), _db); const auto setDataFingerprintQuery2 = _queryManager.get(PreparedSqlQueryManager::SetDataFingerprintQuery2, QByteArrayLiteral("INSERT INTO datafingerprint (fingerprint) VALUES (?1);"), _db); if (!setDataFingerprintQuery1) { - qCDebug(lcDb) << "database error:" << setDataFingerprintQuery1->error(); + qCWarning(lcDb) << "database error:" << setDataFingerprintQuery1->error(); return; } if (!setDataFingerprintQuery2) { - qCDebug(lcDb) << "database error:" << setDataFingerprintQuery2->error(); + qCWarning(lcDb) << "database error:" << setDataFingerprintQuery2->error(); return; } if (!setDataFingerprintQuery1->exec()) { - qCDebug(lcDb) << "database error:" << setDataFingerprintQuery1->error(); + qCWarning(lcDb) << "database error:" << setDataFingerprintQuery1->error(); } setDataFingerprintQuery2->bindValue(1, dataFingerprint); if (!setDataFingerprintQuery2->exec()) { - qCDebug(lcDb) << "database error:" << setDataFingerprintQuery2->error(); + qCWarning(lcDb) << "database error:" << setDataFingerprintQuery2->error(); } } @@ -2476,7 +2476,7 @@ void SyncJournalDb::setConflictRecord(const ConflictRecord &record) _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } @@ -2486,7 +2486,7 @@ void SyncJournalDb::setConflictRecord(const ConflictRecord &record) query->bindValue(4, record.baseEtag); query->bindValue(5, record.initialBasePath); if(!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2500,13 +2500,13 @@ ConflictRecord SyncJournalDb::conflictRecord(const QByteArray &path) } const auto query = _queryManager.get(PreparedSqlQueryManager::GetConflictRecordQuery, QByteArrayLiteral("SELECT baseFileId, baseModtime, baseEtag, basePath FROM conflicts WHERE path=?1;"), _db); if(!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } query->bindValue(1, path); if(!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } if (!query->next().hasData) @@ -2531,7 +2531,7 @@ void SyncJournalDb::setCaseConflictRecord(const ConflictRecord &record) "VALUES (?1, ?2, ?3, ?4, ?5);"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } @@ -2541,7 +2541,7 @@ void SyncJournalDb::setCaseConflictRecord(const ConflictRecord &record) query->bindValue(4, record.baseEtag); query->bindValue(5, record.initialBasePath); if(!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2555,12 +2555,12 @@ ConflictRecord SyncJournalDb::caseConflictRecordByBasePath(const QString &baseNa } const auto query = _queryManager.get(PreparedSqlQueryManager::GetCaseClashConflictRecordQuery, QByteArrayLiteral("SELECT path, baseFileId, baseModtime, baseEtag, basePath FROM caseconflicts WHERE basePath=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } query->bindValue(1, baseNamePath); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } if (!query->next().hasData) @@ -2584,12 +2584,12 @@ ConflictRecord SyncJournalDb::caseConflictRecordByPath(const QString &path) } const auto query = _queryManager.get(PreparedSqlQueryManager::GetCaseClashConflictRecordByPathQuery, QByteArrayLiteral("SELECT path, baseFileId, baseModtime, baseEtag, basePath FROM caseconflicts WHERE path=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return entry; } if (!query->next().hasData) @@ -2611,12 +2611,12 @@ void SyncJournalDb::deleteCaseClashConflictByPathRecord(const QString &path) const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteCaseClashConflictRecordQuery, QByteArrayLiteral("DELETE FROM caseconflicts WHERE path=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2629,11 +2629,11 @@ QByteArrayList SyncJournalDb::caseClashConflictRecordPaths() const auto query = _queryManager.get(PreparedSqlQueryManager::GetAllCaseClashConflictPathQuery, QByteArrayLiteral("SELECT path FROM caseconflicts;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } @@ -2652,12 +2652,12 @@ void SyncJournalDb::deleteConflictRecord(const QByteArray &path) const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteConflictRecordQuery, QByteArrayLiteral("DELETE FROM conflicts WHERE path=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2670,7 +2670,7 @@ QByteArrayList SyncJournalDb::conflictRecordPaths() SqlQuery query(_db); query.prepare("SELECT path FROM conflicts"); if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); return {}; } @@ -2707,7 +2707,7 @@ void SyncJournalDb::clearFileTable() query.prepare("DELETE FROM metadata;"); if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); sqlFail(QStringLiteral("clearFileTable"), query); } } @@ -2725,7 +2725,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path query.bindValue(1, path); if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)), query); } @@ -2737,7 +2737,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path query.bindValue(1, path); if (!query.exec()) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)), query); } } @@ -2755,13 +2755,13 @@ void SyncJournalDb::setE2EeLockedFolder(const QByteArray &folderId, const QByteA "VALUES (?1, ?2);"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, folderId); query->bindValue(2, folderToken); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2775,12 +2775,12 @@ QByteArray SyncJournalDb::e2EeLockedFolder(const QByteArray &folderId) QByteArrayLiteral("SELECT token FROM e2EeLockedFolders WHERE folderId=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, folderId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } if (!query->next().hasData) { @@ -2802,12 +2802,12 @@ QList> SyncJournalDb::e2EeLockedFolders() const auto query = _queryManager.get(PreparedSqlQueryManager::GetE2EeLockedFoldersQuery, QByteArrayLiteral("SELECT * FROM e2EeLockedFolders"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return res; } @@ -2826,12 +2826,12 @@ void SyncJournalDb::deleteE2EeLockedFolder(const QByteArray &folderId) const auto query = _queryManager.get(PreparedSqlQueryManager::DeleteE2EeLockedFolderQuery, QByteArrayLiteral("DELETE FROM e2EeLockedFolders WHERE folderId=?1;"), _db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, folderId); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2843,12 +2843,12 @@ Optional SyncJournalDb::PinStateInterface::rawForPath(const QByteArray const auto query = _db->_queryManager.get(PreparedSqlQueryManager::GetRawPinStateQuery, QByteArrayLiteral("SELECT pinState FROM flags WHERE path == ?1;"), _db->_db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } @@ -2877,12 +2877,12 @@ Optional SyncJournalDb::PinStateInterface::effectiveForPath(const QByt " ORDER BY length(path) DESC LIMIT 1;"), _db->_db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } @@ -2916,12 +2916,12 @@ Optional SyncJournalDb::PinStateInterface::effectiveForPathRecursive(c " AND pinState is not null and pinState != 0;"), _db->_db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } @@ -2929,7 +2929,7 @@ Optional SyncJournalDb::PinStateInterface::effectiveForPathRecursive(c forever { auto next = query->next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return {}; } if (!next.hasData) { @@ -2960,13 +2960,13 @@ void SyncJournalDb::PinStateInterface::setForPath(const QByteArray &path, PinSta "INSERT OR REPLACE INTO flags(path, pinState) VALUES(?1, ?2);"), _db->_db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, path); query->bindValue(2, state); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -2982,12 +2982,12 @@ void SyncJournalDb::PinStateInterface::wipeForPathAndBelow(const QByteArray &pat " (" IS_PREFIX_PATH_OR_EQUAL("?1", "path") " OR ?1 == '');"), _db->_db); if (!query) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); return; } query->bindValue(1, path); if (!query->exec()) { - qCDebug(lcDb) << "database error:" << query->error(); + qCWarning(lcDb) << "database error:" << query->error(); } } @@ -3011,7 +3011,7 @@ SyncJournalDb::PinStateInterface::rawList() forever { auto next = query.next(); if (!next.ok) { - qCDebug(lcDb) << "database error:" << query.error(); + qCWarning(lcDb) << "database error:" << query.error(); return {}; } if (!next.hasData) {