Merge pull request doctrine#233 from lcobucci/improve-sqlite3

Improve SQLite3 adapter
derrabus · Aug 25, 2017 · 5a5e00b · 5a5e00b
2 parents 2121298 + b39fab7
commit 5a5e00b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/lib/Doctrine/Common/Cache/SQLite3Cache.php b/lib/Doctrine/Common/Cache/SQLite3Cache.php
@@ -70,15 +70,20 @@ public function __construct(SQLite3 $sqlite, $table)
         $this->sqlite = $sqlite;
         $this->table  = (string) $table;
 
-        list($id, $data, $exp) = $this->getFields();
-
-        return $this->sqlite->exec(sprintf(
-            'CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY NOT NULL, %s BLOB, %s INTEGER)',
-            $table,
-            $id,
-            $data,
-            $exp
-        ));
+        $this->ensureTableExists();
+    }
+
+    private function ensureTableExists() : void
+    {
+        $this->sqlite->exec(
+            sprintf(
+                'CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY NOT NULL, %s BLOB, %s INTEGER)',
+                $this->table,
+                static::ID_FIELD,
+                static::DATA_FIELD,
+                static::EXPIRATION_FIELD
+            )
+        );
     }
 
     /**

diff --git a/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php b/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php
@@ -7,7 +7,7 @@
 use SQLite3;
 
 /**
- * @requires extension sqlite3
+ * @requires extension sqlite3 >= 3
  */
 class SQLite3CacheTest extends CacheTest
 {