From d84d548618651c0a66bd2696d6547b33ca6b8e87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20M=C3=BCller?= Date: Fri, 20 Sep 2013 20:34:17 +0200 Subject: [PATCH] when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy --- lib/files/cache/scanner.php | 2 ++ tests/lib/files/cache/scanner.php | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index fdbce0d51fe..d296c606865 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -121,6 +121,8 @@ class Scanner extends BasicEmitter { } $parentCacheData = $this->cache->get($parent); $parentCacheData['etag'] = $this->storage->getETag($parent); + // the boolean to int conversion is necessary to make pg happy + $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0; $this->cache->put($parent, $parentCacheData); } } diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index b137799bbcf..8112eada17c 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -195,6 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase { $data1 = $this->cache->get('folder'); $data2 = $this->cache->get(''); $data0['etag'] = ''; + $data0['encrypted'] = $data0['encrypted'] ? 1: 0; $this->cache->put('folder/bar.txt', $data0); // rescan -- 2.39.5