From c668588e1757b16a9b9a8586ee2a2ab936cf1c72 Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Fri, 10 Jun 2016 14:07:31 +0200
Subject: map oracle driver options to params (#23938)

---
 lib/private/DB/ConnectionFactory.php | 4 ++++
 1 file changed, 4 insertions(+)

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'];
-- 
cgit v1.2.3