[Pkg-owncloud-commits] [php-sabredav] 186/220: Postgres support for locks. Added Sqlite tests.

[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 1f148598c061383b768f0f33f32e5b805f7bad0c
Author: Evert Pot <me at evertpot.com>
Date:   Thu Apr 28 13:18:12 2016 +0700

    Postgres support for locks. Added Sqlite tests.
---
 tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php  | 19 +++++++---------
 tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php  | 29 +++++++++++++++++++++++++
 tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php | 29 +++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
index b6f0622..e74eb36 100644
--- a/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
+++ b/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
@@ -11,18 +11,15 @@ class PDOMySQLTest extends AbstractTest {
         if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or it was not properly configured');
         $pdo = \Sabre\TestUtil::getMySQLDB();
         if (!$pdo) $this->markTestSkipped('Could not connect to MySQL database');
+
         $pdo->query('DROP TABLE IF EXISTS locks;');
-        $pdo->query("
-CREATE TABLE locks (
-	id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-	owner VARCHAR(100),
-	timeout INTEGER UNSIGNED,
-	created INTEGER,
-	token VARCHAR(100),
-	scope TINYINT,
-	depth TINYINT,
-	uri text
-);");
+        $queries = file_get_contents(__DIR__ . '/../../../../../examples/sql/mysql.locks.sql');
+        foreach (explode(';', $queries) as $query) {
+            if (trim($query) === '') {
+                continue;
+            }
+            $pdo->query($query);
+        }
 
         $backend = new PDO($pdo);
         return $backend;
diff --git a/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php b/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php
new file mode 100644
index 0000000..1041919
--- /dev/null
+++ b/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Sabre\DAV\Locks\Backend;
+
+require_once 'Sabre/TestUtil.php';
+
+class PDOPgSqlTest extends AbstractTest {
+
+    function getBackend() {
+
+        if (!SABRE_HASPGSQL) $this->markTestSkipped('PgSQL driver is not available, or it was not properly configured');
+        $pdo = \Sabre\TestUtil::getPgSqlDB();
+        if (!$pdo) $this->markTestSkipped('Could not connect to PgSQL database');
+        $pdo->query('DROP TABLE IF EXISTS locks');
+        $queries = file_get_contents(__DIR__ . '/../../../../../examples/sql/pgsql.locks.sql');
+
+        foreach (explode(';', $queries) as $query) {
+            if (trim($query) === '') {
+                continue;
+            }
+            $pdo->query($query);
+        }
+
+        $backend = new PDO($pdo);
+        return $backend;
+
+    }
+
+}
diff --git a/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php b/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php
new file mode 100644
index 0000000..06c1148
--- /dev/null
+++ b/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Sabre\DAV\Locks\Backend;
+
+require_once 'Sabre/TestUtil.php';
+
+class PDOSqliteTest extends AbstractTest {
+
+    function getBackend() {
+
+        if (!SABRE_HASSQLITE) $this->markTestSkipped('Sqlite driver is not available, or it was not properly configured');
+        $pdo = \Sabre\TestUtil::getSqliteDB();
+        if (!$pdo) $this->markTestSkipped('Could not connect to Sqlite database');
+        $pdo->query('DROP TABLE IF EXISTS locks');
+        $queries = file_get_contents(__DIR__ . '/../../../../../examples/sql/sqlite.locks.sql');
+
+        foreach (explode(';', $queries) as $query) {
+            if (trim($query) === '') {
+                continue;
+            }
+            $pdo->query($query);
+        }
+
+        $backend = new PDO($pdo);
+        return $backend;
+
+    }
+
+}

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