From 2ffa017118363de682b439443ee22f25571d9899 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Nov 2017 13:52:54 +0100
Subject: [runmode] Simplify installer

---
 modules-available/runmode/install.inc.php | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/runmode/install.inc.php b/modules-available/runmode/install.inc.php
index ec710bfa..db7e07f6 100644
--- a/modules-available/runmode/install.inc.php
+++ b/modules-available/runmode/install.inc.php
@@ -12,21 +12,8 @@ $res[] = tableCreate('runmode', "
 	KEY `module` (`module`,`modeid`)
 ");
 
-if (!tableExists('machine')) {
-	// Cannot add constraint yet
-	$res[] = UPDATE_RETRY;
-} else {
-	$c = tableGetContraints('runmode', 'machineuuid', 'machine', 'machineuuid');
-	if ($c === false)
-		finalResponse(UPDATE_FAILED, 'Cannot get constraints of runmode table: ' . Database::lastError());
-	if (empty($c)) {
-		$alter = Database::exec('ALTER TABLE runmode ADD FOREIGN KEY (machineuuid) REFERENCES machine (machineuuid)
-			ON DELETE CASCADE ON UPDATE CASCADE');
-		if ($alter === false)
-			finalResponse(UPDATE_FAILED, 'Cannot add machineuuid constraint to runmode table: ' . Database::lastError());
-		$res[] = UPDATE_DONE;
-	}
-}
+$res[] = tableAddConstraint('runmode', 'machineuuid', 'machine', 'machineuuid',
+		'ON DELETE CASCADE ON UPDATE CASCADE');
 
 if (!tableHasColumn('runmode', 'isclient')) {
 	$ret = Database::exec("ALTER TABLE runmode ADD COLUMN isclient bool DEFAULT '1'");
@@ -38,9 +25,4 @@ if (!tableHasColumn('runmode', 'isclient')) {
 }
 
 // Create response for browser
-
-if (in_array(UPDATE_DONE, $res)) {
-	finalResponse(UPDATE_DONE, 'Tables created successfully');
-}
-
-finalResponse(UPDATE_NOOP, 'Everything already up to date');
\ No newline at end of file
+responseFromArray($res);
-- 
cgit v1.2.3-55-g7522