[Pkg-owncloud-commits] [php-sabredav] 05/11: Merge branch '1.8'

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 3cb558e1109c9ccd8a5d0b97c169f9232d52a19f
Merge: 4046953 e2e2871
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue May 20 12:52:35 2014 -0400

    Merge branch '1.8'
    
    Conflicts:
    	ChangeLog
    	examples/sql/mysql.addressbook.sql
    	examples/sql/mysql.calendars.sql
    	lib/DAV/Version.php

 examples/sql/mysql.addressbook.sql |  2 +-
 examples/sql/mysql.calendars.sql   | 20 ++++++++++----------
 examples/sql/mysql.locks.sql       |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --cc examples/sql/mysql.addressbook.sql
index 4fc33a1,e8047db..f9c3c95
--- a/examples/sql/mysql.addressbook.sql
+++ b/examples/sql/mysql.addressbook.sql
@@@ -4,8 -4,8 +4,8 @@@ CREATE TABLE addressbooks 
      displayname VARCHAR(255),
      uri VARCHAR(200),
      description TEXT,
 -    ctag INT(11) UNSIGNED NOT NULL DEFAULT '1',
 +    synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1',
-     UNIQUE(principaluri, uri)
+     UNIQUE(principaluri(100), uri(100))
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
  
  CREATE TABLE cards (
diff --cc examples/sql/mysql.calendars.sql
index e31f1b4,86ee4d8..fc758e6
--- a/examples/sql/mysql.calendars.sql
+++ b/examples/sql/mysql.calendars.sql
@@@ -1,28 -1,28 +1,28 @@@
  CREATE TABLE calendarobjects (
 -    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
 +    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
      calendardata MEDIUMBLOB,
-     uri VARCHAR(200),
-     calendarid INT(11) UNSIGNED NOT NULL,
+     uri VARBINARY(200),
+     calendarid INTEGER UNSIGNED NOT NULL,
      lastmodified INT(11) UNSIGNED,
-     etag VARCHAR(32),
+     etag VARBINARY(32),
      size INT(11) UNSIGNED NOT NULL,
-     componenttype VARCHAR(8),
+     componenttype VARBINARY(8),
      firstoccurence INT(11) UNSIGNED,
      lastoccurence INT(11) UNSIGNED,
      UNIQUE(calendarid, uri)
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
  
  CREATE TABLE calendars (
-     id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-     principaluri VARCHAR(100),
+     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+     principaluri VARBINARY(100),
      displayname VARCHAR(100),
-     uri VARCHAR(200),
-     synctoken INT(11) UNSIGNED NOT NULL DEFAULT '0',
+     uri VARBINARY(200),
 -    ctag INTEGER UNSIGNED NOT NULL DEFAULT '0',
++    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '0',
      description TEXT,
 -    calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0',
 +    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
-     calendarcolor VARCHAR(10),
+     calendarcolor VARBINARY(10),
      timezone TEXT,
-     components VARCHAR(20),
+     components VARBINARY(20),
      transparent TINYINT(1) NOT NULL DEFAULT '0',
      UNIQUE(principaluri, uri)
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

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