summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2016-06-10 14:07:31 +0200
committerThomas Müller <DeepDiver1975@users.noreply.github.com>2016-06-10 14:07:31 +0200
commitc668588e1757b16a9b9a8586ee2a2ab936cf1c72 (patch)
tree1981c778328a5d1ae957152946bedb0571d02867
parenta0d8702a1c168a178846ceba849b1521e6462b0f (diff)
downloadnextcloud-server-c668588e1757b16a9b9a8586ee2a2ab936cf1c72.tar.gz
nextcloud-server-c668588e1757b16a9b9a8586ee2a2ab936cf1c72.zip
map oracle driver options to params (#23938)
-rw-r--r--lib/private/DB/ConnectionFactory.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php
index 0856d8d19c0..6a096e504d8 100644
--- a/lib/private/DB/ConnectionFactory.php
+++ b/lib/private/DB/ConnectionFactory.php
@@ -104,6 +104,10 @@ class ConnectionFactory {
break;
case 'oci':
$eventManager->addEventSubscriber(new OracleSessionInit);
+ // the driverOptions are unused in dbal and need to be mapped to the parameters
+ if (isset($additionalConnectionParams['driverOptions'])) {
+ $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
+ }
break;
case 'sqlite3':
$journalMode = $additionalConnectionParams['sqlite.journal_mode'];