Merge pull request #26 from hranicka/hotfix/sqlitejournal-bug

tests: SQLiteJournal 'Too many variables' bug test added [Ref #25]

Author: dg

src/Caching/Storages/SQLiteJournal.php

@@ -116,17 +116,17 @@ public function clean(array $conditions)
 			return [];
 		}
 
-		$stmt = $this->pdo->prepare(implode(' UNION ', $unions));
+		$unionSql = implode(' UNION ', $unions);
+		$stmt = $this->pdo->prepare($unionSql);
 		$stmt->execute($args);
 		$keys = $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
 		if (empty($keys)) {
 			return [];
 		}
 
-		$in = '(?' . str_repeat(', ?', count($keys) - 1) . ')';
 		$this->pdo->exec('BEGIN');
-		$this->pdo->prepare("DELETE FROM tags WHERE key IN $in")->execute($keys);
-		$this->pdo->prepare("DELETE FROM priorities WHERE key IN $in")->execute($keys);
+		$this->pdo->prepare("DELETE FROM tags WHERE key IN ($unionSql)")->execute($args);
+		$this->pdo->prepare("DELETE FROM priorities WHERE key IN ($unionSql)")->execute($args);
 		$this->pdo->exec('COMMIT');
 
 		return $keys;

tests/Caching/SQLiteJournal.phpt

@@ -21,7 +21,8 @@ class SQLiteJournalTest extends IJournalTestCase
 
 	public function createJournal()
 	{
-		return new SQLiteJournal;
+		static $id = 0;
+		return new SQLiteJournal(TEMP_DIR . '/sqlitejournal_' . ++$id . '.sqlite');
 	}
 
 }

tests/Caching/bugs/SQLiteJournal.tooManyVariables.phpt

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Test: Nette\Caching\Storages\SQLiteStorage tags dependency test.
+ */
+
+use Nette\Caching\Cache;
+use Nette\Caching\Storages\SQLiteJournal;
+use Tester\Assert;
+
+
+require __DIR__ . '/../../bootstrap.php';
+
+
+if (!extension_loaded('pdo_sqlite')) {
+	Tester\Environment::skip('Requires PHP extension pdo_sqlite.');
+}
+
+
+$journal = new SQLiteJournal;
+
+// Writing cache...
+$keys = [];
+for ($i = 0; $i < 2000; $i++) {
+	$keys[] = 'key' . $i;
+}
+
+foreach ($keys as $key) {
+	$journal->write($key, [
+		Cache::TAGS => ['one', 'two'],
+	]);
+}
+
+$journal->write('keyThree', [
+	Cache::TAGS => ['three'],
+]);
+
+// Cleaning by tags...
+$keys = $journal->clean([
+	Cache::TAGS => ['one', 'xx'],
+]);
+
+Assert::same($keys, $keys);

tests/php-win.ini

@@ -1,6 +1,7 @@
 [PHP]
 extension_dir = "./ext"
 extension=php_mbstring.dll
+extension=php_pdo_sqlite.dll
 ;extension=php_memcache.dll
 
 [Zend]