diff options
| author | Simon Rettberg | 2019-03-05 09:53:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-05 09:53:41 +0100 |
| commit | 6976ac880ef90725887e70f58d370d483f832966 (patch) | |
| tree | e5b6083dc19e192b26d4b21470bd865957e261da | |
| parent | [locationinfo] panel: Shorter dash, empty field if no PCs for room (diff) | |
| download | slx-admin-6976ac880ef90725887e70f58d370d483f832966.tar.gz slx-admin-6976ac880ef90725887e70f58d370d483f832966.tar.xz slx-admin-6976ac880ef90725887e70f58d370d483f832966.zip | |
[syslog/locationinfo] Fix install script db refs
| -rw-r--r-- | modules-available/locationinfo/install.inc.php | 4 | ||||
| -rw-r--r-- | modules-available/syslog/install.inc.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/locationinfo/install.inc.php b/modules-available/locationinfo/install.inc.php index 3a27d696..fc02ed76 100644 --- a/modules-available/locationinfo/install.inc.php +++ b/modules-available/locationinfo/install.inc.php @@ -60,11 +60,11 @@ if ($t1 === UPDATE_NOOP) { if ($t1 === UPDATE_DONE || $t2 === UPDATE_DONE) { Database::exec('UPDATE locationinfo_locationconfig SET serverid = NULL WHERE serverid = 0'); Database::exec('ALTER TABLE `locationinfo_locationconfig` ADD CONSTRAINT `locationinfo_locationconfig_ibfk_1` FOREIGN KEY ( `serverid` ) - REFERENCES `openslx`.`locationinfo_coursebackend` (`serverid`) ON DELETE SET NULL ON UPDATE CASCADE'); + REFERENCES `locationinfo_coursebackend` (`serverid`) ON DELETE SET NULL ON UPDATE CASCADE'); } if ($t1 === UPDATE_DONE) { if (false === Database::exec('ALTER TABLE `locationinfo_locationconfig` ADD CONSTRAINT `locationinfo_locationconfig_ibfk_2` FOREIGN KEY ( `locationid` ) - REFERENCES `openslx`.`location` (`locationid`) ON DELETE CASCADE ON UPDATE CASCADE')) { + REFERENCES `location` (`locationid`) ON DELETE CASCADE ON UPDATE CASCADE')) { $res[] = UPDATE_RETRY; } } diff --git a/modules-available/syslog/install.inc.php b/modules-available/syslog/install.inc.php index 9d79c811..d42a4e0e 100644 --- a/modules-available/syslog/install.inc.php +++ b/modules-available/syslog/install.inc.php @@ -31,11 +31,11 @@ if (!tableHasColumn('clientlog', 'machineuuid')) { // 2017-11-03: Create proper index for query in statistics module if (tableHasIndex('clientlog', ['machineuuid'])) { - $r = Database::exec("ALTER TABLE `openslx`.`clientlog` DROP INDEX `machineuuid`"); + $r = Database::exec("ALTER TABLE `clientlog` DROP INDEX `machineuuid`"); $res[] = $r === false ? UPDATE_FAILED : UPDATE_DONE; } if (!tableHasIndex('clientlog', ['machineuuid', 'logid'])) { - $r = Database::exec("ALTER TABLE `openslx`.`clientlog` + $r = Database::exec("ALTER TABLE `clientlog` ADD INDEX `machineuuid` ( `machineuuid` , `logid` )"); $res[] = $r === false ? UPDATE_FAILED : UPDATE_DONE; } |