From a6c088a1ef1ff8f1e1161ab9a61d8f1e57231b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 29 Oct 2014 17:23:27 +0100
Subject: [PATCH] adding new config parameter for sqlite to specify the journal
 mode

---
 config/config.sample.php             |  6 +++++
 lib/private/db/connectionfactory.php |  4 +++-
 lib/private/db/sqlitesessioninit.php | 10 ++++++++-
 tests/preseed-config.php             | 33 ++++++++++++++--------------
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 2287b7af7d..bacde038b9 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -133,6 +133,12 @@ $CONFIG = array(
 	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
 ),
 
+/**
+ * sqlite3 journal mode can be specified using this config parameter - can be 'WAL' or 'DELETE'
+ * see for more details https://www.sqlite.org/wal.html
+ */
+'sqlite.journal_mode' => 'DELETE',
+
 /**
  * Indicates whether the ownCloud instance was installed successfully; ``true``
  * indicates a successful installation, and ``false`` indicates an unsuccessful
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index f6253e09b9..58043b3044 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -90,7 +90,8 @@ class ConnectionFactory {
 				$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
 				break;
 			case 'sqlite3':
-				$eventManager->addEventSubscriber(new SQLiteSessionInit);
+				$journalMode = $additionalConnectionParams['sqlite.journal_mode'];
+				$eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
 				break;
 		}
 		$connection = \Doctrine\DBAL\DriverManager::getConnection(
@@ -153,6 +154,7 @@ class ConnectionFactory {
 		}
 
 		$connectionParams['tablePrefix'] = $config->getSystemValue('dbtableprefix', 'oc_');
+		$connectionParams['sqlite.journal_mode'] = $config->getSystemValue('sqlite.journal_mode', 'WAL');
 
 		//additional driver options, eg. for mysql ssl
 		$driverOptions = $config->getSystemValue('dbdriveroptions', null);
diff --git a/lib/private/db/sqlitesessioninit.php b/lib/private/db/sqlitesessioninit.php
index 7e1166be95..1fff22b883 100644
--- a/lib/private/db/sqlitesessioninit.php
+++ b/lib/private/db/sqlitesessioninit.php
@@ -18,13 +18,20 @@ class SQLiteSessionInit implements EventSubscriber {
 	 */
 	private $caseSensitiveLike;
 
+	/**
+	 * @var string
+	 */
+	private $journalMode;
+
 	/**
 	 * Configure case sensitive like for each connection
 	 *
 	 * @param bool $caseSensitiveLike
+	 * @param string $journalMode
 	 */
-	public function __construct($caseSensitiveLike = true) {
+	public function __construct($caseSensitiveLike, $journalMode) {
 		$this->caseSensitiveLike = $caseSensitiveLike;
+		$this->journalMode = $journalMode;
 	}
 
 	/**
@@ -34,6 +41,7 @@ class SQLiteSessionInit implements EventSubscriber {
 	public function postConnect(ConnectionEventArgs $args) {
 		$sensitive = ($this->caseSensitiveLike) ? 'true' : 'false';
 		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
 	}
 
 	public function getSubscribedEvents() {
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 3fd5b3cb7f..3f41573bf2 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -1,22 +1,21 @@
 <?php
 $CONFIG = array (
-  "appstoreenabled" => false,
-  'apps_paths' =>
-  array (
-    0 =>
-    array (
-      'path' => OC::$SERVERROOT.'/apps',
-      'url' => '/apps',
-      'writable' => true,
-    ),
-    1 =>
-    array (
-      'path' => OC::$SERVERROOT.'/apps2',
-      'url' => '/apps2',
-      'writable' => false,
-    )
-    ),
-
+	"appstoreenabled" => false,
+	'apps_paths' =>
+		array (
+			0 =>
+				array (
+					'path' => OC::$SERVERROOT.'/apps',
+					'url' => '/apps',
+					'writable' => true,
+				),
+			1 =>
+				array (
+					'path' => OC::$SERVERROOT.'/apps2',
+					'url' => '/apps2',
+					'writable' => false,
+				)
+		),
 );
 
 if(substr(strtolower(PHP_OS), 0, 3) == "win") {