From 1732ffed7a3a9c1ab8811baef3a36f70a64bce7a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 19 Feb 2018 10:59:21 +0100 Subject: backport update 1201 to the new update system and move dummy update to 1202 --- Zotlabs/Update/_1201.php | 18 +++++++++++++----- Zotlabs/Update/_1202.php | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 Zotlabs/Update/_1202.php (limited to 'Zotlabs/Update') diff --git a/Zotlabs/Update/_1201.php b/Zotlabs/Update/_1201.php index c12797377..416d35ad6 100644 --- a/Zotlabs/Update/_1201.php +++ b/Zotlabs/Update/_1201.php @@ -6,10 +6,18 @@ class _1201 { function run() { - // empty update in order to make the DB_UPDATE_VERSION equal to the current maximum update function - // rather than being one greater than the last known update - - return UPDATE_SUCCESS; + if(ACTIVE_DBTYPE == DBTYPE_MYSQL) { + $r = q("ALTER TABLE item + DROP INDEX item_thread_top, + ADD INDEX uid_item_thread_top (uid, item_thread_top), + ADD INDEX uid_item_blocked (uid, item_blocked), + ADD INDEX item_deleted_pending_remove_changed (item_deleted, item_pending_remove, changed) + "); + } + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; } -} \ No newline at end of file + +} diff --git a/Zotlabs/Update/_1202.php b/Zotlabs/Update/_1202.php new file mode 100644 index 000000000..c9ccd157b --- /dev/null +++ b/Zotlabs/Update/_1202.php @@ -0,0 +1,15 @@ + Date: Mon, 19 Feb 2018 20:23:13 +0100 Subject: updates 1201 and 1200 should return success for postgres. notifications: remove class show and session storage entry when we mark all notifications seen --- Zotlabs/Update/_1198.php | 2 +- Zotlabs/Update/_1200.php | 12 ++++++++---- Zotlabs/Update/_1201.php | 10 +++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'Zotlabs/Update') diff --git a/Zotlabs/Update/_1198.php b/Zotlabs/Update/_1198.php index 0713bb6ce..d188c94f6 100644 --- a/Zotlabs/Update/_1198.php +++ b/Zotlabs/Update/_1198.php @@ -21,4 +21,4 @@ function run() { } -} \ No newline at end of file +} diff --git a/Zotlabs/Update/_1200.php b/Zotlabs/Update/_1200.php index 00c742593..9f7bfb152 100644 --- a/Zotlabs/Update/_1200.php +++ b/Zotlabs/Update/_1200.php @@ -10,11 +10,15 @@ function run() { DROP INDEX item_type, ADD INDEX uid_item_type (uid, item_type) "); - } - if($r) + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + } + else { return UPDATE_SUCCESS; - return UPDATE_FAILED; + } + } -} \ No newline at end of file +} diff --git a/Zotlabs/Update/_1201.php b/Zotlabs/Update/_1201.php index 416d35ad6..920a7401e 100644 --- a/Zotlabs/Update/_1201.php +++ b/Zotlabs/Update/_1201.php @@ -13,11 +13,15 @@ class _1201 { ADD INDEX uid_item_blocked (uid, item_blocked), ADD INDEX item_deleted_pending_remove_changed (item_deleted, item_pending_remove, changed) "); - } - if($r) + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + } + else { return UPDATE_SUCCESS; - return UPDATE_FAILED; + } + } } -- cgit v1.2.3