Merge branch '3.1' of github.com:fruux/sabre-dav into 3.1

CHANGELOG.md

@@ -8,6 +8,8 @@ ChangeLog
   deleting them.
 * #787: Cannot use non-seekable stream-wrappers with range requests.
 * Faster XML parsing and generating due to sabre/xml update.
+* #793: The Sqlite schema is now more strict and more similar to the MySQL
+  schema. This solves a problem within Baikal.
 * The zip release ships with [sabre/vobject 4.0.3][vobj],
   [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
   [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].

examples/sql/sqlite.addressbooks.sql

@@ -1,28 +1,28 @@
 CREATE TABLE addressbooks (
-    id integer primary key asc,
-    principaluri text,
+    id integer primary key asc NOT NULL,
+    principaluri text NOT NULL,
     displayname text,
-    uri text,
+    uri text NOT NULL,
     description text,
-    synctoken integer
+    synctoken integer DEFAULT 1 NOT NULL
 );
 
 CREATE TABLE cards (
-    id integer primary key asc,
-    addressbookid integer,
+    id integer primary key asc NOT NULL,
+    addressbookid integer NOT NULL,
     carddata blob,
-    uri text,
+    uri text NOT NULL,
     lastmodified integer,
     etag text,
     size integer
 );
 
 CREATE TABLE addressbookchanges (
-    id integer primary key asc,
+    id integer primary key asc NOT NULL,
     uri text,
-    synctoken integer,
-    addressbookid integer,
-    operation integer
+    synctoken integer NOT NULL,
+    addressbookid integer NOT NULL,
+    operation integer NOT NULL
 );
 
 CREATE INDEX addressbookid_synctoken ON addressbookchanges (addressbookid, synctoken);

examples/sql/sqlite.calendars.sql

@@ -1,46 +1,46 @@
 CREATE TABLE calendarobjects (
-    id integer primary key asc,
-    calendardata blob,
-    uri text,
-    calendarid integer,
-    lastmodified integer,
-    etag text,
-    size integer,
+    id integer primary key asc NOT NULL,
+    calendardata blob NOT NULL,
+    uri text NOT NULL,
+    calendarid integer NOT NULL,
+    lastmodified integer NOT NULL,
+    etag text NOT NULL,
+    size integer NOT NULL,
     componenttype text,
     firstoccurence integer,
     lastoccurence integer,
     uid text
 );
 
 CREATE TABLE calendars (
-    id integer primary key asc,
-    principaluri text,
+    id integer primary key asc NOT NULL,
+    principaluri text NOT NULL,
     displayname text,
-    uri text,
-    synctoken integer,
+    uri text NOT NULL,
+    synctoken integer DEFAULT 1 NOT NULL,
     description text,
     calendarorder integer,
     calendarcolor text,
     timezone text,
-    components text,
+    components text NOT NULL,
     transparent bool
 );
 
 CREATE TABLE calendarchanges (
-    id integer primary key asc,
+    id integer primary key asc NOT NULL,
     uri text,
-    synctoken integer,
-    calendarid integer,
-    operation integer
+    synctoken integer NOT NULL,
+    calendarid integer NOT NULL,
+    operation integer NOT NULL
 );
 
 CREATE INDEX calendarid_synctoken ON calendarchanges (calendarid, synctoken);
 
 CREATE TABLE calendarsubscriptions (
-    id integer primary key asc,
-    uri text,
-    principaluri text,
-    source text,
+    id integer primary key asc NOT NULL,
+    uri text NOT NULL,
+    principaluri text NOT NULL,
+    source text NOT NULL,
     displayname text,
     refreshrate text,
     calendarorder integer,
@@ -52,13 +52,13 @@ CREATE TABLE calendarsubscriptions (
 );
 
 CREATE TABLE schedulingobjects (
-    id integer primary key asc,
-    principaluri text,
+    id integer primary key asc NOT NULL,
+    principaluri text NOT NULL,
     calendardata blob,
-    uri text,
+    uri text NOT NULL,
     lastmodified integer,
-    etag text,
-    size integer
+    etag text NOT NULL,
+    size integer NOT NULL
 );
 
 CREATE INDEX principaluri_uri ON calendarsubscriptions (principaluri, uri);

examples/sql/sqlite.locks.sql

@@ -1,6 +1,6 @@
 BEGIN TRANSACTION;
 CREATE TABLE locks (
-	id integer primary key asc,
+	id integer primary key asc NOT NULL,
 	owner text,
 	timeout integer,
 	created integer,

examples/sql/sqlite.principals.sql

@@ -1,15 +1,15 @@
 CREATE TABLE principals (
-    id INTEGER PRIMARY KEY ASC,
-    uri TEXT,
+    id INTEGER PRIMARY KEY ASC NOT NULL,
+    uri TEXT NOT NULL,
     email TEXT,
     displayname TEXT,
     UNIQUE(uri)
 );
 
 CREATE TABLE groupmembers (
-    id INTEGER PRIMARY KEY ASC,
-    principal_id INTEGER,
-    member_id INTEGER,
+    id INTEGER PRIMARY KEY ASC NOT NULL,
+    principal_id INTEGER NOT NULL,
+    member_id INTEGER NOT NULL,
     UNIQUE(principal_id, member_id)
 );
 

examples/sql/sqlite.propertystorage.sql

@@ -1,8 +1,8 @@
 CREATE TABLE propertystorage (
-    id integer primary key asc,
-    path text,
-    name text,
-    valuetype integer,
+    id integer primary key asc NOT NULL,
+    path text NOT NULL,
+    name text NOT NULL,
+    valuetype integer NOT NULL,
     value string
 );
 

examples/sql/sqlite.users.sql

@@ -1,7 +1,7 @@
 CREATE TABLE users (
-	id integer primary key asc,
-	username TEXT,
-	digesta1 TEXT,
+	id integer primary key asc NOT NULL,
+	username TEXT NOT NULL,
+	digesta1 TEXT NOT NULL,
 	UNIQUE(username)
 );
 

tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php

@@ -21,7 +21,7 @@ function getPDO() {
             $pdo->exec($sql);
 
         }
-        $pdo->exec('INSERT INTO propertystorage (path, name, value) VALUES ("dir", "{DAV:}displayname", "Directory")');
+        $pdo->exec('INSERT INTO propertystorage (path, name, value, valuetype) VALUES ("dir", "{DAV:}displayname", "Directory", 1)');
 
         return $pdo;
 

tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php

@@ -21,7 +21,7 @@ function getPDO() {
             $pdo->exec($sql);
 
         }
-        $pdo->exec('INSERT INTO propertystorage (path, name, value) VALUES ("dir", "{DAV:}displayname", "Directory")');
+        $pdo->exec('INSERT INTO propertystorage (path, name, value, valuetype) VALUES ("dir", "{DAV:}displayname", "Directory", 1)');
 
         return $pdo;