fix(Migration): Merge per-user-database-duplicate bookmarks before hashing URLs#2362
fix(Migration): Merge per-user-database-duplicate bookmarks before hashing URLs#2362marcelklehr merged 23 commits intomasterfrom
Conversation
doesn't touch duplicates count in the UI see #2361 Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
There was a problem hiding this comment.
Pull request overview
This pull request aims to fix issue #2361, which caused SQL unique constraint violations during migration from v6.0.1 to v6.1.0. The issue occurred because the migration Version016002000Date20260201124723 was hashing URLs and enforcing a unique constraint on (user_id, url_hash) without first deduplicating existing bookmarks that have the same URL for the same user.
Changes:
- Added Version016002000Date20260218124723.php to deduplicate bookmarks with the same URL per user before hashing
- Added Version016002000Date20260218134723.php to hash URLs after deduplication
- The deduplication migration merges folders, tags, and descriptions from duplicate bookmarks into a primary bookmark
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 18 comments.
| File | Description |
|---|---|
| lib/Migration/Version016002000Date20260218124723.php | New migration that deduplicates bookmarks by URL and user before hashing, merging tags, folders, and descriptions |
| lib/Migration/Version016002000Date20260218134723.php | New migration that hashes URLs after deduplication is complete |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
57c19e2 to
d660675
Compare
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
89d733b to
8be3903
Compare
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
|
Weirdly, Floccus integration tests are not failing on master but failing on this PR, although it only touches the migrations 🤔 |
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
doesn't touch duplicates count in the UI
see #2361