#1696 notesubfolders: preserve tag links on rename and move

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## 26.4.16
 
+- Tag assignments are now preserved when a **note subfolder** is renamed,
+  moved, or contains notes that are moved as part of a subfolder operation;
+  the subfolder path update now uses a safe prefix-only replacement so that
+  sibling folders sharing the same name prefix and notes whose path components
+  happen to repeat the folder name are no longer incorrectly modified
+  (for [#1696](https://github.com/pbek/QOwnNotes/issues/1696))
 - Refactored the **Settings dialog** by extracting individual settings pages
   into separate widget classes and moved them to a dedicated `widgets/settings`
   directory for better code organization (for [#3570](https://github.com/pbek/QOwnNotes/issues/3570))

src/entities/notesubfolder.cpp

@@ -178,6 +178,13 @@ bool NoteSubFolder::rename(const QString& newName) {
         Note::updateQualifiedWikiLinksForSubfolderRename(oldRelativePath, newRelativePath);
         Note::updateRelativeMarkdownLinksForSubfolderRename(oldRelativePath, newRelativePath);
 
+        // Persist the new name to the database so that the re-index triggered
+        // by the folder rename below can locate the existing row by its new
+        // name and reuse it (instead of deleting the old row and creating a
+        // fresh one with a new id, which would cause note rows to be
+        // recreated and tag links to be temporarily unresolvable).
+        store();
+
         // rename the note subfolder
         const bool ret = QDir().rename(oldPath, newPath);
 

src/entities/tag.cpp

@@ -1288,17 +1288,27 @@ bool Tag::renameNoteFileNamesOfLinks(const QString &oldFileName, const QString &
 
 /**
  * Renames the note sub folder paths of note links
+ *
+ * Uses prefix-only substitution to avoid accidentally modifying sibling paths
+ * that share the same prefix (e.g. renaming "work" must not affect "workplace"),
+ * and to prevent the global replace() from corrupting paths that contain the
+ * old folder name in a deeper component (e.g. "A/A/note" when renaming "A").
  */
 bool Tag::renameNoteSubFolderPathsOfLinks(const QString &oldPath, const QString &newPath) {
     QSqlDatabase db = DatabaseService::getNoteFolderDatabase();
     QSqlQuery query(db);
+    // Replace only the prefix: match the exact path or direct/deep children
+    // (separated by "/"), then concatenate newPath with the remainder of the
+    // original string so that inner occurrences of the old name are untouched.
     query.prepare(
         QStringLiteral("UPDATE noteTagLink SET note_sub_folder_path = "
-                       "replace(note_sub_folder_path, :oldPath, :newPath) WHERE "
-                       "note_sub_folder_path LIKE :oldPathLike"));
+                       ":newPath || substr(note_sub_folder_path, length(:oldPath2) + 1) "
+                       "WHERE note_sub_folder_path = :oldPath "
+                       "OR note_sub_folder_path LIKE :oldPathChildLike"));
 
     query.bindValue(QStringLiteral(":oldPath"), oldPath);
-    query.bindValue(QStringLiteral(":oldPathLike"), oldPath + "%");
+    query.bindValue(QStringLiteral(":oldPath2"), oldPath);
+    query.bindValue(QStringLiteral(":oldPathChildLike"), oldPath + "/%");
     query.bindValue(QStringLiteral(":newPath"), newPath);
 
     if (!query.exec()) {