Merge remote-tracking branch 'upstream/dev' into plugin-repo

1 files changed, 18 insertions, 7 deletions

diff --git a/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql b/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql
index aa7639c5f..0baed8bfb 100644
--- a/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql
+++ b/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql
@@ -1,17 +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,
-	ctag 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 NOT NULL,
+    lastmodified integer,
+    etag text,
+    size integer
+);
+
+CREATE TABLE addressbookchanges (
+    id integer primary key asc NOT NULL,
     uri text,
-    lastmodified integer
+    synctoken integer NOT NULL,
+    addressbookid integer NOT NULL,
+    operation integer NOT NULL
 );
 
+CREATE INDEX addressbookid_synctoken ON addressbookchanges (addressbookid, synctoken);