[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] duplicate key collision in sefurl migrations

ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
bc7cc30a by Mohamed Elbahja at 2026-04-26T11:42:03+00:00
[FIX] duplicate key collision in sefurl migrations
---
* [FIX] restore dl for file type and refactor sefurl migrations

* [FIX] duplicate key collision in sefurl migrations

See merge request tikiwiki/tiki!10069

- - - - -


4 changed files:

- db/tiki.sql
- installer/schema/20260123_update_right_column_for_file_type_in_sefurl_tiki.sql
- installer/schema/20260212_update_regex_right_column_for_file_type_in_sefurl_tiki.sql
- + installer/schema/20260213_restore_right_dl_for_file_type_in_sefurl_tiki.sql


Changes:

=====================================
db/tiki.sql
=====================================
@@ -3455,7 +3455,7 @@ INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES(
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-view_blog_post.php\\?postId=(\\d+)', 'blogpost$1', 'blogpost', 'feature_blogs');
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-directory_browse.php\\?parent=(\\d+)', 'directory$1', 'directory', 'feature_directory');
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-view_faq.php\\?faqId=(\\d+)', 'faq$1', 'faq', 'feature_faqs');
-INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`, `order`) VALUES('tiki-download_file.php\\?fileId=(\\d+)', 'display$1', 'file', 'feature_file_galleries', 10);
+INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`, `order`) VALUES('tiki-download_file.php\\?fileId=(\\d+)', 'dl$1', 'file', 'feature_file_galleries', 10);
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-download_file.php\\?fileId=(\\d+)(?:&|&)thumbnail(?:=[^&]*)?(?=(?:&|&|$))', 'thumbnail$1', 'thumbnail', 'feature_file_galleries');
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-download_file.php\\?fileId=(\\d+)(?:&|&)display(?:=[^&]*)?(?=(?:&|&|$))', 'display$1', 'display', 'feature_file_galleries');
 INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`) VALUES('tiki-download_file.php\\?fileId=(\\d+)(?:&|&)preview(?:=[^&]*)?(?=(?:&|&|$))', 'preview$1', 'preview', 'feature_file_galleries');


=====================================
installer/schema/20260123_update_right_column_for_file_type_in_sefurl_tiki.sql
=====================================
@@ -1,6 +1,8 @@
 UPDATE `tiki_sefurl_regex_out`
 SET `left` = 'tiki-download_file.php\\?fileId=(\\d+)(?:&|&)display'
-WHERE `right` = 'display$1' AND `feature` = 'feature_file_galleries';
+WHERE `right` = 'display$1'
+  AND `feature` = 'feature_file_galleries'
+  AND `type` = 'display';
 
 
 UPDATE `tiki_sefurl_regex_out`


=====================================
installer/schema/20260212_update_regex_right_column_for_file_type_in_sefurl_tiki.sql
=====================================
@@ -1,7 +1,8 @@
 UPDATE `tiki_sefurl_regex_out`
 SET `left` = 'tiki-download_file.php\\?fileId=(\\d+)(?:&|&)display(?:=[^&]*)?(?=(?:&|&|$))'
-WHERE `right` = 'display$1' AND `feature` = 'feature_file_galleries';
-
+WHERE `right` = 'display$1'
+  AND `feature` = 'feature_file_galleries'
+  AND `type` = 'display';
 
 UPDATE `tiki_sefurl_regex_out`
 SET `left` = 'tiki-download_file.php\\?fileId=(\\d+)(?:&|&)thumbnail(?:=[^&]*)?(?=(?:&|&|$))'


=====================================
installer/schema/20260213_restore_right_dl_for_file_type_in_sefurl_tiki.sql
=====================================
@@ -0,0 +1,5 @@
+UPDATE `tiki_sefurl_regex_out`
+SET `right` = 'dl$1'
+WHERE `left` = 'tiki-download_file.php\\?fileId=(\\d+)'
+  AND `feature` = 'feature_file_galleries'
+  AND `type` = 'file';



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/bc7cc30a7cf6abb5cbed80af579bac636ee5ca2f

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/bc7cc30a7cf6abb5cbed80af579bac636ee5ca2f
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs