From 462e73529e17428314f00663d9af04c70429046f Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 15 Jul 2024 13:28:13 +0700 Subject: [PATCH] Update to 14 --- conf/migrate_13.0.6.sql | 13 +++++++++++++ conf/version.json | 6 +++--- manifest.toml | 6 +++--- scripts/upgrade | 14 +++++++++++++- 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 conf/migrate_13.0.6.sql diff --git a/conf/migrate_13.0.6.sql b/conf/migrate_13.0.6.sql new file mode 100644 index 0000000..9d3154d --- /dev/null +++ b/conf/migrate_13.0.6.sql @@ -0,0 +1,13 @@ +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; +delete a from observation a join (select no_observation from observation group by date_obs, no_compte having count(no_observation)>1) b on a.no_observation = b.no_observation; + +alter table observation add constraint unique_compte_and_date unique (no_compte, date_obs); \ No newline at end of file diff --git a/conf/version.json b/conf/version.json index faef2af..0137410 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh6", - "build": "2024-07-12", - "commit": "005599f" + "version": "14~ynh1", + "build": "2024-07-15", + "commit": "2c14d71" } diff --git a/manifest.toml b/manifest.toml index b0252d6..8b0aa08 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Moncycle" description.en = "Menstrual cycle follow-up for natural family planning" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" -version = "13~ynh6" +version = "14~ynh1" maintainers = ["Raoul de Limezy"] @@ -34,8 +34,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/005599f6468cfc7112b860eef114e2d0e2d3eb5f.zip" - sha256 = "beda527b33a9ebbf707e218535757364539f9b9452c935b265d49f888652e606" + url = "https://github.com/jean-io/moncycle.app/archive/2c14d712156c803244c10d14b90206721e678818.zip" + sha256 = "b309d2e25428c3f5a33a93504838d83b8a98b1d8152903cdf340a2f83a777f25" autoupdate.strategy = "latest_github_release" [resources.system_user] diff --git a/scripts/upgrade b/scripts/upgrade index c5c4d72..8a2dd47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,6 +46,8 @@ pushd "$install_dir" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else if ynh_compare_current_package_version --comparison le --version 7.0~ynh6 then @@ -54,13 +56,23 @@ pushd "$install_dir" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_7.0.6.sql ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else if ynh_compare_current_package_version --comparison le --version 9.0~ynh3 then ynh_add_config --template="../conf/migrate_9.0.3.sql" --destination="$install_dir/migrate_9.0.3.sql" ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_9.0.3.sql + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql else - ynh_script_progression --message="7.0.6 to 8.0 database migration not required since package > 7.0.6" + if ynh_compare_current_package_version --comparison le --version 13~ynh6 + then + ynh_add_config --template="../conf/migrate_13.0.6.sql" --destination="$install_dir/migrate_13.0.6.sql" + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < migrate_13.0.6.sql + else + ynh_script_progression --message="No migrations required since package > 13.0.6" + fi fi fi fi