mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 08:34:42 +01:00
do NOT stall, if restore contains Guacamole tables, but current installation does not (they only get truncated, but not created)
This commit is contained in:
parent
eb105dfad4
commit
e6a1487fae
@ -567,7 +567,12 @@ class Backup
|
|||||||
// do NOT create GUACAMOLE tables, just truncate them (as we have no abstraction to create the foreign keys)
|
// do NOT create GUACAMOLE tables, just truncate them (as we have no abstraction to create the foreign keys)
|
||||||
if (preg_match(self::GUACAMOLE_REGEXP, $table_name))
|
if (preg_match(self::GUACAMOLE_REGEXP, $table_name))
|
||||||
{
|
{
|
||||||
$this->db->query('TRUNCATE TABLE '.$this->db->name_quote($table_name));
|
try {
|
||||||
|
$this->db->query('TRUNCATE TABLE '.$this->db->name_quote($table_name));
|
||||||
|
}
|
||||||
|
catch (Exception $e) {
|
||||||
|
echo "<p><b>Failed to TRUNCATE TABLE $table_name: ".$e->getMessage()."</b></p>\n";
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// if column is longtext in current schema, convert text to longtext, in case user already updated column
|
// if column is longtext in current schema, convert text to longtext, in case user already updated column
|
||||||
|
Loading…
Reference in New Issue
Block a user