DirectoryDAO: Fix file path matching when relocating directories #4146
Conversation
The SQL string quote character ' in path names needs to be escaped.
|
@vonzimr Can you confirm that his one is working? |
|
The scope of |
|
Tests on Windows are fixed after fixing the build. |
|
Ping |
src/library/dao/directorydao.cpp
Outdated
| DEBUG_ASSERT(!oldFolder.endsWith('/')); | ||
| const QString oldFolderPrefix = oldFolder + '/'; | ||
| const QString startsWithOldFolder = SqlLikeWildcardEscaper::apply( | ||
| oldFolderPrefix, kSqlLikeMatchAll) + | ||
| kSqlLikeMatchAll; |
There was a problem hiding this comment.
This code is duplicated in TrackDAO. Should this be moved into a utility function?
Also, please use the term "directory" instead of "folder". "Folder" is used on windows because it displays stuff as "Folders" in the WIndows Explorer. And the Control Panel or the Network Neighborhood are folders, but not directories. We are referring to the file system here, so directory is the correct term. /smartass-mode off
There was a problem hiding this comment.
I have decided to keep the existing names to minimize the changes. But we could rename the variables.
There was a problem hiding this comment.
It's not that important, but it would be good to keep it in mind for new code.
There was a problem hiding this comment.
The escape character must match the following SQL query. This gets lost when moving the code into a function. Not really helpful here.
There was a problem hiding this comment.
Btw, I am not going to write any new database code in C++ ;) Only inevitable bug fixes.
|
Alright, let's wait for CI, then we can merge IMHO. |
|
CI passed so I went ahead and merged. |
|
I'll merge to main, non-trivial conflicts as expected. |
CHANGELOG: Fix relocation of directories with special/reserved characters in path name