summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-10-27 16:00:13 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-10-27 16:00:13 +0100
commita00712aa65169b248cac8e541dfe69fd82082609 (patch)
tree82944a0942f277734d104071a5a8f9a1a47e11da /lib/private
parent8de287f2efe2eafcbda8c54590e363486719257e (diff)
parentde72aff2c1303b848cbf6fa49ea3d8a466344491 (diff)
downloadnextcloud-server-a00712aa65169b248cac8e541dfe69fd82082609.tar.gz
nextcloud-server-a00712aa65169b248cac8e541dfe69fd82082609.zip
Merge pull request #11783 from owncloud/allow_passing_driver_options
allow passing db driver options
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/db/connectionfactory.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index 1f676f1fca2..f6253e09b95 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -153,6 +153,13 @@ class ConnectionFactory {
}
$connectionParams['tablePrefix'] = $config->getSystemValue('dbtableprefix', 'oc_');
+
+ //additional driver options, eg. for mysql ssl
+ $driverOptions = $config->getSystemValue('dbdriveroptions', null);
+ if ($driverOptions) {
+ $connectionParams['driverOptions'] = $driverOptions;
+ }
+
return $connectionParams;
}
}