[Pkg-owncloud-commits] [php-sabredav] 01/19: Switched charset from all mysql tables to utf8mb4

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.0.6
in repository php-sabredav.

commit 929e5faa4fcceaedb19f96284bf4c31bbd15c538
Author: Evert Pot <me at evertpot.com>
Date:   Mon Oct 26 22:33:05 2015 -0400

    Switched charset from all mysql tables to utf8mb4
---
 examples/sql/mysql.addressbook.sql     |  6 +++---
 examples/sql/mysql.calendars.sql       | 10 +++++-----
 examples/sql/mysql.locks.sql           |  2 +-
 examples/sql/mysql.principals.sql      |  4 ++--
 examples/sql/mysql.propertystorage.sql |  3 ++-
 examples/sql/mysql.users.sql           |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/examples/sql/mysql.addressbook.sql b/examples/sql/mysql.addressbook.sql
index 5ec8428..3d7e295 100644
--- a/examples/sql/mysql.addressbook.sql
+++ b/examples/sql/mysql.addressbook.sql
@@ -6,7 +6,7 @@ CREATE TABLE addressbooks (
     description TEXT,
     synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1',
     UNIQUE(principaluri(100), uri(100))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE cards (
     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -16,7 +16,7 @@ CREATE TABLE cards (
     lastmodified INT(11) UNSIGNED,
     etag VARBINARY(32),
     size INT(11) UNSIGNED NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE addressbookchanges (
     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -25,4 +25,4 @@ CREATE TABLE addressbookchanges (
     addressbookid INT(11) UNSIGNED NOT NULL,
     operation TINYINT(1) NOT NULL,
     INDEX addressbookid_synctoken (addressbookid, synctoken)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
diff --git a/examples/sql/mysql.calendars.sql b/examples/sql/mysql.calendars.sql
index 55d3b48..4ec6771 100644
--- a/examples/sql/mysql.calendars.sql
+++ b/examples/sql/mysql.calendars.sql
@@ -11,7 +11,7 @@ CREATE TABLE calendarobjects (
     lastoccurence INT(11) UNSIGNED,
     uid VARBINARY(200),
     UNIQUE(calendarid, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE calendars (
     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -26,7 +26,7 @@ CREATE TABLE calendars (
     components VARBINARY(20),
     transparent TINYINT(1) NOT NULL DEFAULT '0',
     UNIQUE(principaluri, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE calendarchanges (
     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -35,7 +35,7 @@ CREATE TABLE calendarchanges (
     calendarid INT(11) UNSIGNED NOT NULL,
     operation TINYINT(1) NOT NULL,
     INDEX calendarid_synctoken (calendarid, synctoken)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE calendarsubscriptions (
     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -51,7 +51,7 @@ CREATE TABLE calendarsubscriptions (
     stripattachments TINYINT(1) NULL,
     lastmodified INT(11) UNSIGNED,
     UNIQUE(principaluri, uri)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE schedulingobjects (
     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
@@ -61,4 +61,4 @@ CREATE TABLE schedulingobjects (
     lastmodified INT(11) UNSIGNED,
     etag VARBINARY(32),
     size INT(11) UNSIGNED NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
diff --git a/examples/sql/mysql.locks.sql b/examples/sql/mysql.locks.sql
index 6dda3db..5170bae 100644
--- a/examples/sql/mysql.locks.sql
+++ b/examples/sql/mysql.locks.sql
@@ -9,5 +9,5 @@ CREATE TABLE locks (
     uri VARBINARY(1000),
     INDEX(token),
     INDEX(uri(100))
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
diff --git a/examples/sql/mysql.principals.sql b/examples/sql/mysql.principals.sql
index e23e40e..af2a4b0 100644
--- a/examples/sql/mysql.principals.sql
+++ b/examples/sql/mysql.principals.sql
@@ -4,14 +4,14 @@ CREATE TABLE principals (
     email VARBINARY(80),
     displayname VARCHAR(80),
     UNIQUE(uri)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE groupmembers (
     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
     principal_id INTEGER UNSIGNED NOT NULL,
     member_id INTEGER UNSIGNED NOT NULL,
     UNIQUE(principal_id, member_id)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 
 INSERT INTO principals (uri,email,displayname) VALUES
diff --git a/examples/sql/mysql.propertystorage.sql b/examples/sql/mysql.propertystorage.sql
index f0a21a1..910bd5d 100644
--- a/examples/sql/mysql.propertystorage.sql
+++ b/examples/sql/mysql.propertystorage.sql
@@ -4,5 +4,6 @@ CREATE TABLE propertystorage (
     name VARBINARY(100) NOT NULL,
     valuetype INT UNSIGNED,
     value MEDIUMBLOB
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
+
 CREATE UNIQUE INDEX path_property ON propertystorage (path(600), name(100));
diff --git a/examples/sql/mysql.users.sql b/examples/sql/mysql.users.sql
index ab67b47..7395395 100644
--- a/examples/sql/mysql.users.sql
+++ b/examples/sql/mysql.users.sql
@@ -3,7 +3,7 @@ CREATE TABLE users (
     username VARBINARY(50),
     digesta1 VARBINARY(32),
     UNIQUE(username)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
 
 INSERT INTO users (username,digesta1) VALUES
 ('admin',  '87fd274b7b6c01e48d7c2f965da8ddf7');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git