initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 21 insertions, 36 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
index a9bbb0bd1..5a4a7a327 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
@@ -18,48 +18,33 @@ class PDOSqliteTest extends AbstractPDOTest {
      */
     function getPDO() {
 
+        return self::getSQLite();
+
+    }
+
+    /**
+     * @return PDO
+     */
+    static function getSQLite() {
+
         if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
         $pdo = new \PDO('sqlite:'.SABRE_TEMPDIR.'/pdobackend');
         $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
 
         $pdo->query("DROP TABLE IF EXISTS addressbooks");
+        $pdo->query("DROP TABLE IF EXISTS addressbookchanges");
         $pdo->query("DROP TABLE IF EXISTS cards");
-        $pdo->query("
-CREATE TABLE addressbooks (
-    id integer primary key asc,
-    principaluri text,
-    displayname text,
-    uri text,
-    description text,
-	ctag integer
-);
-
-");
-
-        $pdo->query("
-INSERT INTO addressbooks
-    (principaluri, displayname, uri, description, ctag)
-VALUES
-    ('principals/user1', 'book1', 'book1', 'addressbook 1', 1);
-");
-
-        $pdo->query("
-
-CREATE TABLE cards (
-	id integer primary key asc,
-    addressbookid integer,
-    carddata text,
-    uri text,
-    lastmodified integer
-);
-
-");
-        $pdo->query("
-INSERT INTO cards
-    (addressbookid, carddata, uri, lastmodified)
-VALUES
-    (1, 'card1', 'card1', 0);
-");
+
+        $queries = explode(
+            ';',
+            file_get_contents(__DIR__ . '/../../../../examples/sql/sqlite.addressbooks.sql')
+        );
+
+        foreach($queries as $query) {
+            $query = trim($query," \r\n\t");
+            if ($query)
+                $pdo->exec($query);
+        }
 
         return $pdo;