Branch 'kolab-syncroton-2.2' - docs/SQL

Aleksander Machniak machniak at kolabsys.com
Tue Sep 30 19:50:13 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 f530259e745951984b5e79aa92229ce65acabb5c
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Thu Sep 4 15:32:44 2014 -0400

    Revert "Add missing ENGINE and CHARACTER SET clauses (#3262)"
    
    This reverts commit 76a196b642b1413b7937e9979ab4170383f1569e.

diff --git a/docs/SQL/mysql.initial.sql b/docs/SQL/mysql.initial.sql
index d042dce..bbaa2c7 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,
@@ -32,7 +32,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`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_folder` (
     `id` varchar(40) NOT NULL,
@@ -49,7 +49,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 
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_synckey` (
     `id` varchar(40) NOT NULL,
@@ -61,7 +61,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
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_content` (
     `id` varchar(40) NOT NULL,
@@ -75,7 +75,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
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_data` (
     `id` varchar(40) NOT NULL,
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data` (
     `folder_id` varchar(40) NOT NULL,
     `data` longblob,
     PRIMARY KEY (`id`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
     `id` varchar(40) NOT NULL,
@@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
     `owner_id` varchar(40) NOT NULL,
     `parent_id` varchar(40) DEFAULT NULL,
     PRIMARY KEY (`id`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
     `device_id` varchar(40) NOT NULL,
@@ -102,7 +102,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
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
 
 -- 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 d9169ee..bcf8453 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`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
diff --git a/docs/SQL/mysql/2013011600.sql b/docs/SQL/mysql/2013011600.sql
index 0c6b7ec..914f750 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
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ENGINE=InnoDB;
diff --git a/docs/SQL/mysql/2013040700.sql b/docs/SQL/mysql/2013040700.sql
index b68440c..501d3d9 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