mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 11:48:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

JournalDb: Some Sql statement fixes, make t7 work again.

Browse source 
plus some minor fixes.
This commit is contained in:
Klaas Freitag 2014-10-16 11:22:57 +02:00
parent e51c299937
commit 36eaff92e5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mirall/syncjournaldb.cpp
View file

@ -432,7 +432,6 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
if( fileId.isEmpty() ) fileId = ""; if( fileId.isEmpty() ) fileId = "";
QString remotePerm (record._remotePerm); QString remotePerm (record._remotePerm);
if (remotePerm.isEmpty()) remotePerm = QString(); // have NULL in DB (vs empty) if (remotePerm.isEmpty()) remotePerm = QString(); // have NULL in DB (vs empty)
_setFileRecordQuery->bindValue(1, QString::number(phash)); _setFileRecordQuery->bindValue(1, QString::number(phash));
_setFileRecordQuery->bindValue(2, plen); _setFileRecordQuery->bindValue(2, plen);
_setFileRecordQuery->bindValue(3, record._path ); _setFileRecordQuery->bindValue(3, record._path );
@ -534,7 +533,7 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
_getFileRecordQuery->reset(); _getFileRecordQuery->reset();
} else { } else {
QString err = _getFileRecordQuery->error(); QString err = _getFileRecordQuery->error();
qDebug() << "No journal entry found for " << filename; qDebug() << "No journal entry found for " << filename;
} }
} }
return rec; return rec;
@ -961,8 +960,8 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item
retries--; retries--;
if( retries < 0 ) retries = 0; if( retries < 0 ) retries = 0;
iQuery.prepare( "UPDATE blacklist SET lastTryEtag = ?1, lastTryModtime = ?1, " iQuery.prepare( "UPDATE blacklist SET lastTryEtag = ?1, lastTryModtime = ?2, "
"retrycount = ?2, errorstring = ?3 WHERE path=?4"); "retrycount = ?3, errorstring = ?4 WHERE path=?5;");
iQuery.bindValue(1, item._lastTryEtag); iQuery.bindValue(1, item._lastTryEtag);
iQuery.bindValue(2, QString::number(item._lastTryModtime)); iQuery.bindValue(2, QString::number(item._lastTryModtime));
iQuery.bindValue(3, retries); iQuery.bindValue(3, retries);
@ -971,7 +970,7 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item
} else { } else {
// there is no entry yet. // there is no entry yet.
iQuery.prepare("INSERT INTO blacklist (path, lastTryEtag, lastTryModtime, retrycount, errorstring) " iQuery.prepare("INSERT INTO blacklist (path, lastTryEtag, lastTryModtime, retrycount, errorstring) "
"VALUES (?1, ?2, ?3, ?4, ?5;"); "VALUES (?1, ?2, ?3, ?4, ?5);");
iQuery.bindValue(1, item._file ); iQuery.bindValue(1, item._file );
iQuery.bindValue(2, item._lastTryEtag); iQuery.bindValue(2, item._lastTryEtag);
@ -995,8 +994,9 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QString& path)
} }
SqlQuery query(_db); SqlQuery query(_db);
query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE path == ?1 OR path LIKE(?||'/%')"); query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE path == ?1 OR path LIKE(?2||'/%')");
query.bindValue(1, path); query.bindValue(1, path);
query.bindValue(2, path);
if( !query.exec() ) { if( !query.exec() ) {
qDebug() << Q_FUNC_INFO << "SQL error in avoidRenamesOnNextSync: "<< query.error(); qDebug() << Q_FUNC_INFO << "SQL error in avoidRenamesOnNextSync: "<< query.error();
} else { } else {
@ -1023,7 +1023,7 @@ void SyncJournalDb::avoidReadFromDbOnNextSync(const QString& fileName)
SqlQuery query(_db); SqlQuery query(_db);
// This query will match entries for whitch the path is a prefix of fileName // This query will match entries for whitch the path is a prefix of fileName
query.prepare("UPDATE metadata SET md5='_invalid_' WHERE ?1 LIKE(path||'/%') AND type == 2"); // CSYNC_FTW_TYPE_DIR == 2 query.prepare("UPDATE metadata SET md5='_invalid_' WHERE ?1 LIKE(path||'/%') AND type == 2;"); // CSYNC_FTW_TYPE_DIR == 2
query.bindValue(1, fileName); query.bindValue(1, fileName);
if( !query.exec() ) { if( !query.exec() ) {
qDebug() << Q_FUNC_INFO << "SQL error in avoidRenamesOnNextSync: "<< query.error(); qDebug() << Q_FUNC_INFO << "SQL error in avoidRenamesOnNextSync: "<< query.error();