diff options
| author | Simon Rettberg | 2017-11-28 13:39:34 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-11-28 13:39:34 +0100 |
| commit | 9335cf1158870647f23cd7e6922eef508178a3d5 (patch) | |
| tree | 97dab6ec08a27adbd36953c88b12e85e48534351 /modules-available/sysconfig/install.inc.php | |
| parent | [baseconfig] Add current unix timestamp to config (diff) | |
| download | slx-admin-9335cf1158870647f23cd7e6922eef508178a3d5.tar.gz slx-admin-9335cf1158870647f23cd7e6922eef508178a3d5.tar.xz slx-admin-9335cf1158870647f23cd7e6922eef508178a3d5.zip | |
[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.
Diffstat (limited to 'modules-available/sysconfig/install.inc.php')
| -rw-r--r-- | modules-available/sysconfig/install.inc.php | 11 |
1 files changed, 0 insertions, 11 deletions
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 |