From 3d5e5fba8a9a05417ff63f78c1d3a402fde31825 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Sun, 22 Jun 2014 12:19:54 +0200
Subject: [PATCH] Put SQL update directly in PHP update code instead of SQL
 file

---
 dist/php/{5.3.1.sql => 5.3.1.php} | 60 ++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)
 rename dist/php/{5.3.1.sql => 5.3.1.php} (51%)

diff --git a/dist/php/5.3.1.sql b/dist/php/5.3.1.php
similarity index 51%
rename from dist/php/5.3.1.sql
rename to dist/php/5.3.1.php
index 90b0866dca..79125572bf 100644
--- a/dist/php/5.3.1.sql
+++ b/dist/php/5.3.1.php
@@ -1,3 +1,21 @@
+<?php
+// FORCE bootstrap_context copy, otherwise it won't reboot
+if (is_file(AJXP_INSTALL_PATH."/conf/bootstrap_context.php".".new-".date("Ymd"))) {
+    rename(AJXP_INSTALL_PATH."/conf/bootstrap_context.php", AJXP_INSTALL_PATH."/conf/bootstrap_context.php.pre-update");
+    rename(AJXP_INSTALL_PATH."/conf/bootstrap_context.php".".new-".date("Ymd"), AJXP_INSTALL_PATH."/conf/bootstrap_context.php");
+}
+
+// FORCE bootstrap_context copy, otherwise it won't reboot
+if (is_file(AJXP_INSTALL_PATH."/conf/bootstrap_repositories.php".".new-".date("Ymd"))) {
+    rename(AJXP_INSTALL_PATH."/conf/bootstrap_repositories.php", AJXP_INSTALL_PATH."/conf/bootstrap_repositories.php.pre-update");
+    rename(AJXP_INSTALL_PATH."/conf/bootstrap_repositories.php".".new-".date("Ymd"), AJXP_INSTALL_PATH."/conf/bootstrap_repositories.php");
+}
+
+echo "The bootstrap_context and bootstrap_repositories files were replaced by the new version, the .pre-update version is kept.";
+
+echo "Upgrading database ...";
+
+$dbInst = "
 /* SEPARATOR */
 ALTER TABLE ajxp_user_rights ADD INDEX (login), ADD INDEX (repo_uuid);
 /* SEPARATOR */
@@ -54,4 +72,44 @@
 /* SEPARATOR */
 DROP TABLE `ajxp_log`;
 /* SEPARATOR */
-RENAME TABLE `ajxp_log2` TO `ajxp_log`;
\ No newline at end of file
+RENAME TABLE `ajxp_log2` TO `ajxp_log`;
+";
+
+
+$confDriver = ConfService::getConfStorageImpl();
+$authDriver = ConfService::getAuthDriverImpl();
+$logger = AJXP_Logger::getInstance();
+if (is_a($confDriver, "sqlConfDriver")) {
+    $test = $confDriver->getOption("SQL_DRIVER");
+    if (!isSet($test["driver"])) {
+        $test = AJXP_Utils::cleanDibiDriverParameters($confDriver->getOption("SQL_DRIVER"));
+    }
+    if (is_array($test) && isSet($test["driver"])) {
+
+        $parts = array_map("trim", explode("/* SEPARATOR */", $dbInst));
+        $results = array();
+        $errors = array();
+
+        require_once(AJXP_BIN_FOLDER."/dibi.compact.php");
+        dibi::connect($test);
+        dibi::begin();
+        foreach ($parts as $sqlPart) {
+            if(empty($sqlPart)) continue;
+            try {
+                dibi::nativeQuery($sqlPart);
+                echo "<div class='upgrade_result success'>$sqlPart ... OK</div>";
+            } catch (DibiException $e) {
+                $errors[] = $e->getMessage();
+                echo "<div class='upgrade_result success'>$sqlPart ... FAILED (".$e->getMessage().")</div>";
+            }
+        }
+        dibi::commit();
+        dibi::disconnect();
+
+    } else {
+        echo "Nothing to do for the DB";
+    }
+
+} else {
+    echo "Nothing to do for the DB";
+}