From 497451ea24665e6e1b63817afb73d708fc52e03d Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 25 Aug 2013 12:40:44 +0200 Subject: [PATCH] Use CREATE TABLE IF NOT EXISTS in database init scripts --- .../calendar/drivers/database/SQL/mysql.initial.sql | 10 +++++----- plugins/calendar/drivers/kolab/SQL/mysql.initial.sql | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/calendar/drivers/database/SQL/mysql.initial.sql b/plugins/calendar/drivers/database/SQL/mysql.initial.sql index 60cc076b..945d429b 100644 --- a/plugins/calendar/drivers/database/SQL/mysql.initial.sql +++ b/plugins/calendar/drivers/database/SQL/mysql.initial.sql @@ -12,7 +12,7 @@ * **/ -CREATE TABLE `calendars` ( +CREATE TABLE IF NOT EXISTS `calendars` ( `calendar_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0', `name` varchar(255) NOT NULL, @@ -24,7 +24,7 @@ CREATE TABLE `calendars` ( REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -CREATE TABLE `events` ( +CREATE TABLE IF NOT EXISTS `events` ( `event_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `calendar_id` int(11) UNSIGNED NOT NULL DEFAULT '0', `recurrence_id` int(11) UNSIGNED NOT NULL DEFAULT '0', @@ -55,7 +55,7 @@ CREATE TABLE `events` ( REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE ON UPDATE CASCADE ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -CREATE TABLE `attachments` ( +CREATE TABLE IF NOT EXISTS `attachments` ( `attachment_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `event_id` int(11) UNSIGNED NOT NULL DEFAULT '0', `filename` varchar(255) NOT NULL DEFAULT '', @@ -67,7 +67,7 @@ CREATE TABLE `attachments` ( REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -CREATE TABLE `itipinvitations` ( +CREATE TABLE IF NOT EXISTS `itipinvitations` ( `token` VARCHAR(64) NOT NULL, `event_uid` VARCHAR(255) NOT NULL, `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0', @@ -80,4 +80,4 @@ CREATE TABLE `itipinvitations` ( REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -INSERT INTO system (name, value) VALUES ('calendar-database-version', '2013051600'); +REPLACE INTO system (name, value) VALUES ('calendar-database-version', '2013051600'); diff --git a/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql b/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql index 00032baf..f10d9029 100644 --- a/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql +++ b/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql @@ -29,4 +29,4 @@ CREATE TABLE IF NOT EXISTS `itipinvitations` ( REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2013011000'); +REPLACE INTO system (name, value) VALUES ('calendar-kolab-version', '2013011000');