[Pkg-owncloud-commits] [php-sabredav] 03/19: let mysql pick the default collation

[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 3676d97889fbfb6e4b2ed0ee781e88d067758f60
Author: Evert Pot <me at evertpot.com>
Date:   Mon Oct 26 22:47:53 2015 -0400

    let mysql pick the default collation
---
 examples/sql/mysql.addressbook.sql     |  6 +++---
 examples/sql/mysql.calendars.sql       | 10 +++++-----
 examples/sql/mysql.locks.sql           |  3 +--
 examples/sql/mysql.principals.sql      |  5 ++---
 examples/sql/mysql.propertystorage.sql |  2 +-
 examples/sql/mysql.users.sql           |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/examples/sql/mysql.addressbook.sql b/examples/sql/mysql.addressbook.sql
index 3d7e295..9ec88ba 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/examples/sql/mysql.calendars.sql b/examples/sql/mysql.calendars.sql
index 4ec6771..e3f5a01 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/examples/sql/mysql.locks.sql b/examples/sql/mysql.locks.sql
index 5170bae..96a3a88 100644
--- a/examples/sql/mysql.locks.sql
+++ b/examples/sql/mysql.locks.sql
@@ -9,5 +9,4 @@ CREATE TABLE locks (
     uri VARBINARY(1000),
     INDEX(token),
     INDEX(uri(100))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/examples/sql/mysql.principals.sql b/examples/sql/mysql.principals.sql
index af2a4b0..ea0d16a 100644
--- a/examples/sql/mysql.principals.sql
+++ b/examples/sql/mysql.principals.sql
@@ -4,15 +4,14 @@ CREATE TABLE principals (
     email VARBINARY(80),
     displayname VARCHAR(80),
     UNIQUE(uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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;
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 INSERT INTO principals (uri,email,displayname) VALUES
 ('principals/admin', 'admin at example.org','Administrator'),
diff --git a/examples/sql/mysql.propertystorage.sql b/examples/sql/mysql.propertystorage.sql
index 910bd5d..1b5ca5a 100644
--- a/examples/sql/mysql.propertystorage.sql
+++ b/examples/sql/mysql.propertystorage.sql
@@ -4,6 +4,6 @@ CREATE TABLE propertystorage (
     name VARBINARY(100) NOT NULL,
     valuetype INT UNSIGNED,
     value MEDIUMBLOB
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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 7395395..22ac312 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 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