docs/SQL

Aleksander Machniak machniak at kolabsys.com
Mon Sep 1 13:25:59 CEST 2014


 docs/SQL/mysql.initial.sql    |   16 ++++++++--------
 docs/SQL/mysql/2013011200.sql |    2 +-
 docs/SQL/mysql/2013011600.sql |    2 +-
 docs/SQL/mysql/2013040700.sql |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6d8654fc43846d2274879f7837292f2102cd0582
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Sep 1 13:25:33 2014 +0200

    Add missing ENGINE and CHARACTER SET clauses (#3262)

diff --git a/docs/SQL/mysql.initial.sql b/docs/SQL/mysql.initial.sql
index 71106b9..2e0de38 100644
--- a/docs/SQL/mysql.initial.sql
+++ b/docs/SQL/mysql.initial.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_policy` (
     `policy_key` varchar(64) NOT NULL,
     `json_policy` blob NOT NULL,
     PRIMARY KEY (`id`)
-);
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_device` (
     `id` varchar(40) NOT NULL,
@@ -33,7 +33,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_device` (
     `emailfilter_id` varchar(40) DEFAULT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `owner_id--deviceid` (`owner_id`, `deviceid`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_folder` (
     `id` varchar(40) NOT NULL,
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_folder` (
     UNIQUE KEY `device_id--class--folderid` (`device_id`(40),`class`(40),`folderid`(40)),
     KEY `folderstates::device_id--devices::id` (`device_id`),
     CONSTRAINT `folderstates::device_id--devices::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE 
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_synckey` (
     `id` varchar(40) NOT NULL,
@@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_synckey` (
     PRIMARY KEY (`id`),
     UNIQUE KEY `device_id--type--counter` (`device_id`,`type`,`counter`),
     CONSTRAINT `syncroton_synckey::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_content` (
     `id` varchar(40) NOT NULL,
@@ -76,7 +76,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_content` (
     UNIQUE KEY `device_id--folder_id--contentid` (`device_id`(40),`folder_id`(40),`contentid`(128)),
     KEY `syncroton_contents::device_id` (`device_id`),
     CONSTRAINT `syncroton_contents::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_data` (
     `id` varchar(40) NOT NULL,
@@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data` (
     `folder_id` varchar(40) NOT NULL,
     `data` longblob,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
     `id` varchar(40) NOT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
     `owner_id` varchar(40) NOT NULL,
     `parent_id` varchar(40) DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
     `device_id` varchar(40) NOT NULL,
@@ -103,7 +103,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
     PRIMARY KEY (`device_id`,`folder_id`,`synctime`),
     KEY `syncroton_modseq::device_id` (`device_id`),
     CONSTRAINT `syncroton_modseq::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 -- Roundcube core table should exist if we're using the same database
 
diff --git a/docs/SQL/mysql/2013011200.sql b/docs/SQL/mysql/2013011200.sql
index bcf8453..d9169ee 100644
--- a/docs/SQL/mysql/2013011200.sql
+++ b/docs/SQL/mysql/2013011200.sql
@@ -8,4 +8,4 @@ CREATE TABLE `syncroton_data_folder` (
     `owner_id` varchar(40) NOT NULL,
     `parent_id` varchar(40) DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/docs/SQL/mysql/2013011600.sql b/docs/SQL/mysql/2013011600.sql
index 914f750..0c6b7ec 100644
--- a/docs/SQL/mysql/2013011600.sql
+++ b/docs/SQL/mysql/2013011600.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
     PRIMARY KEY (`device_id`,`folder_id`,`synctime`),
     KEY `syncroton_modseq::device_id` (`device_id`),
     CONSTRAINT `syncroton_modseq::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/docs/SQL/mysql/2013040700.sql b/docs/SQL/mysql/2013040700.sql
index 501d3d9..b68440c 100644
--- a/docs/SQL/mysql/2013040700.sql
+++ b/docs/SQL/mysql/2013040700.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `syncroton_policy` (
     `policy_key` varchar(64) NOT NULL,
     `json_policy` blob NOT NULL,
     PRIMARY KEY (`id`)
-);
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;




More information about the commits mailing list