From 9335cf1158870647f23cd7e6922eef508178a3d5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 28 Nov 2017 13:39:34 +0100
Subject: [sysconfig] Revert contraint to location table: Breaks default config

Default config is locationid = 0, which obviously doesn't work with
the constraint. Using NULL proves difficult here (dups etc.), so
don't for now, and add code to the cron hook that will clean up
deleted locations.
---
 modules-available/sysconfig/install.inc.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'modules-available/sysconfig/install.inc.php')

diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php
index 251b3de9..3e99b777 100644
--- a/modules-available/sysconfig/install.inc.php
+++ b/modules-available/sysconfig/install.inc.php
@@ -47,17 +47,6 @@ if (in_array(UPDATE_DONE, $res)) {
 	$res[] = tableAddConstraint('configtgz_location', 'configid', 'configtgz', 'configid',
 		'ON DELETE CASCADE ON UPDATE CASCADE');
 }
-// To location
-if (tableExists('location')) {
-	// Cleanup from when we didn't have the constraint
-	Database::exec("DELETE c FROM configtgz_location c
-			LEFT JOIN location l USING (locationid)
-			WHERE l.locationid IS NULL");
-	$res[] = tableAddConstraint('configtgz_location', 'locationid', 'location', 'locationid',
-			'ON UPDATE CASCADE ON DELETE CASCADE');
-} elseif (Module::get('locations') !== false) {
-	$res[] = UPDATE_RETRY;
-}
 
 // Update path
 
-- 
cgit v1.2.3-55-g7522