From 7a1b46122290d3e06e96cfba36d97a9a2944d0ec Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Fri, 17 Mar 2023 22:46:56 +0100 Subject: [PATCH 1/3] fix migration from 7.3.0 (#413) Co-authored-by: Kay0u --- scripts/_common.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1412e11..e762d7b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -52,10 +52,9 @@ mariadb-to-pg() { # Focalboard is broken in Mattermost 7.3.0 if ynh_compare_current_package_version --comparison eq --version 7.3.0~ynh1 then - # Remove Focalboard tables - # Command from https://stackoverflow.com/a/1589324 - cmd=$(ynh_mysql_execute_as_root --sql="SELECT CONCAT( 'DROP TABLE ', GROUP_CONCAT(table_name) , ';' ) AS statement FROM information_schema.tables WHERE table_schema = '$db_name' AND table_name LIKE 'focalboard_%';" --database=$db_name | tail -n 1) - ynh_mysql_execute_as_root --sql="$cmd" --database=$db_name + remove_focalboard_if_7_3_0="EXCLUDING TABLE NAMES MATCHING ~/^focalboard_/" + else + remove_focalboard_if_7_3_0="" fi # Use pgloader to migrate database content from MariaDB to PostgreSQL @@ -74,6 +73,8 @@ SET MySQL PARAMETERS net_read_timeout = '90', net_write_timeout = '180' +$remove_focalboard_if_7_3_0 + ALTER SCHEMA '$db_name' RENAME TO 'public' ; From cac6adb186056e00ae5f70d4d4cd1f66b3f8b986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:47:44 +0100 Subject: [PATCH 2/3] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7c79493..2fb79dc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "7.5.2~ynh1", + "version": "7.5.2~ynh2", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 8173f39da2cfd6cce0e7935e858f0ca9041713fe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Mar 2023 21:47:49 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 08dc734..aa27901 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - New features and improvements released regularly -**Shipped version:** 7.5.2~ynh1 +**Shipped version:** 7.5.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 341ed50..7cf32b2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Nouvelles fonctionnalités et améliorations publiées régulièrement -**Version incluse :** 7.5.2~ynh1 +**Version incluse :** 7.5.2~ynh2 ## Captures d’écran