diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php b/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php index f3f0c620..2783bda4 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php @@ -322,22 +322,9 @@ protected function upgrade($sVersionFrom, $sVersionTo) { if (!defined("PROJECT_DB_MYSQL") || PROJECT_DB_MYSQL === false) { $pdo->exec('UPDATE calendars SET synctoken = 1 WHERE synctoken IS NULL'); - $pdo->exec('UPDATE addressbooks SET synctoken = 1 WHERE synctoken IS NULL'); $tmpTable = '_' . time(); $pdo->exec('ALTER TABLE calendars RENAME TO calendars' . $tmpTable); - $pdo->exec('ALTER TABLE addressbooks RENAME TO addressbooks' . $tmpTable); - - $pdo->exec(' -CREATE TABLE addressbooks ( - id integer primary key asc NOT NULL, - principaluri text NOT NULL, - displayname text, - uri text NOT NULL, - description text, - synctoken integer DEFAULT 1 NOT NULL -); - '); $pdo->exec(' CREATE TABLE calendars ( @@ -355,9 +342,8 @@ protected function upgrade($sVersionFrom, $sVersionTo) { );'); $pdo->exec('INSERT INTO calendars SELECT id, principaluri, displayname, uri, synctoken, description, calendarorder, calendarcolor, timezone, components, transparent FROM calendars' . $tmpTable); - $pdo->exec('INSERT INTO addressbooks SELECT id, principaluri, displayname, uri, description, synctoken FROM addressbooks' . $tmpTable); - $this->aSuccess[] = 'Updated calendars and addressbooks tables'; + $this->aSuccess[] = 'Updated calendars table'; } @@ -386,7 +372,7 @@ protected function upgrade($sVersionFrom, $sVersionTo) { '); $pdo->exec('INSERT INTO addressbooks SELECT id, principaluri, displayname, uri, description, synctoken FROM addressbooks' . $tmpTable); - $this->aSuccess[] = 'Updated addressbooks tables'; + $this->aSuccess[] = 'Updated addressbooks table'; }