From 240a8e119552726181410190d4eac2150eb44a5c Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 10 Oct 2022 16:01:10 +0200 Subject: [PATCH] fixes #1744 upgrade script from 12 to 13 --- install/upgrade_11.0.0.php | 2 +- install/upgrade_12.0.0.php | 111 +++++++++++++++++++++++++++++++++++++ upgrade.php | 4 ++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 install/upgrade_12.0.0.php diff --git a/install/upgrade_11.0.0.php b/install/upgrade_11.0.0.php index eb8d50d90..b25be2873 100644 --- a/install/upgrade_11.0.0.php +++ b/install/upgrade_11.0.0.php @@ -107,5 +107,5 @@ echo ''; ob_end_clean(); // now we upgrade from 12.0.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_12.0.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_12.0.0.php'); ?> diff --git a/install/upgrade_12.0.0.php b/install/upgrade_12.0.0.php new file mode 100644 index 000000000..449057e6d --- /dev/null +++ b/install/upgrade_12.0.0.php @@ -0,0 +1,111 @@ += 163) // TODO change on each release (first task to run) + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 12.0.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release + ) + ); +} + +if (!empty($inserts)) +{ + mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); +} + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +ob_start(); +echo '
';
+
+for ($upgrade_id = 163; $upgrade_id <= 164; $upgrade_id++) // TODO change on each release
+{
+  if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+  {
+    continue;
+  }
+
+  // maybe the upgrade task has already been applied in a previous and
+  // incomplete upgrade
+  if (in_array($upgrade_id, $applied))
+  {
+    continue;
+  }
+  
+  unset($upgrade_description);
+
+  echo "\n\n";
+  echo '=== upgrade '.$upgrade_id."\n";
+
+  // include & execute upgrade script. Each upgrade script must contain
+  // $upgrade_description variable which describe briefly what the upgrade
+  // script does.
+  $up_start = get_moment();
+  include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
+
+  // notify upgrade (TODO change on each release)
+  $query = '
+INSERT INTO `'.PREFIX_TABLE.'upgrade`
+  (id, applied, description)
+  VALUES
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 12.0.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
+;';
+  pwg_query($query);
+}
+
+echo '
'; +ob_end_clean(); + +// now we upgrade from 13.0.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_13.0.0.php'); +?> diff --git a/upgrade.php b/upgrade.php index c385b91f1..4e7526ba3 100644 --- a/upgrade.php +++ b/upgrade.php @@ -352,6 +352,10 @@ SELECT id { $current_release = '11.0.0'; } + else if (!in_array(164, $applied_upgrades)) + { + $current_release = '12.0.0'; + } else { // confirm that the database is in the same version as source code files