maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix sql query to remove duplicates before setting unique key in updater, fixes #840

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-05-18 20:48:48 +02:00
parent bc73ed0c75
commit ffa9205f95
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -624,8 +624,9 @@ if (\Froxlor\Froxlor::isDatabaseVersion('202004140')) {
// check for duplicate entries prior to set a unique key to avoid errors on update // check for duplicate entries prior to set a unique key to avoid errors on update
Database::query(" Database::query("
DELETE a.* FROM domain_ssl_settings AS a DELETE a.* FROM domain_ssl_settings AS a
LEFT JOIN domain_ssl_settings AS b ON UNIX_TIMESTAMP(b.`expirationdate`) > UNIX_TIMESTAMP(a.`expirationdate`) LEFT JOIN domain_ssl_settings AS b ON
AND (b.`domainid`=a.`domainid` OR (UNIX_TIMESTAMP(b.`expirationdate`) = UNIX_TIMESTAMP(a.`expirationdate`) AND b.`id`>a.`id`)) ((b.`domainid`=a.`domainid` AND UNIX_TIMESTAMP(b.`expirationdate`) > UNIX_TIMESTAMP(a.`expirationdate`))
OR (UNIX_TIMESTAMP(b.`expirationdate`) = UNIX_TIMESTAMP(a.`expirationdate`) AND b.`id`>a.`id`))
WHERE b.`id` IS NOT NULL WHERE b.`id` IS NOT NULL
"); ");
Database::query("ALTER TABLE `domain_ssl_settings` ADD UNIQUE(`domainid`)"); Database::query("ALTER TABLE `domain_ssl_settings` ADD UNIQUE(`domainid`)");