Add serverPath column to db metadata table #12033
Draft
+183
−47
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a first step to fix issues where file names are normalized differently on the server vs. the client.
| @@ -72,6 +72,7 @@ SyncFileItemPtr SyncFileItem::fromSyncJournalFileRecord(const SyncJournalFileRec | |||
| item->_remotePerm = rec._remotePerm; | |||
| item->_serverHasIgnoredFiles = rec._serverHasIgnoredFiles; | |||
| item->_checksumHeader = rec._checksumHeader; | |||
| item->_remoteName = QString::fromUtf8(rec._serverPath); | |||
There was a problem hiding this comment.
Shouldn't we have the same name remoteName for DB as well? Just to be consistent ...
|
|
||
| if (columns.indexOf("remoteName") == -1) { | ||
| SqlQuery query(_db); | ||
| query.prepare("ALTER TABLE blacklist ADD COLUMN remoteName VARCHAR(4096);"); |
There was a problem hiding this comment.
Isn't there a central mechanism taking care of db migrations? This feels so wrong
In follow-up commits, handling for different normalizations between the server and the client is added. So when doing a server request, the recorded remote name has to be used. This also adds a bit of documentation to clarify what the propagator jobs do.
erikjv
force-pushed
the
work/serverpath
branch
from
6792dd4 to
eef4228
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a first step to fix issues where file names are normalized differently on the server vs. the client.