fix oci8 TNS connect descriptor

6d4e5d4a · Steve Müller · Benjamin Eberlei · df00bd4b · 6d4e5d4a
Commit 6d4e5d4a authored Nov 21, 2013 by Steve Müller Committed by Benjamin Eberlei Dec 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

Driver.php lib/Doctrine/DBAL/Driver/OCI8/Driver.php +8 -5

No files found.
--- a/lib/Doctrine/DBAL/Driver/OCI8/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/OCI8/Driver.php
@@ -64,15 +64,18 @@ class Driver implements \Doctrine\DBAL\Driver
                $dsn .= '(PORT=1521)';
            }

+            $database = 'SID=' . $params['dbname'];
+            $pooled   = '';
+
            if (isset($params['service']) && $params['service'] == true) {
-                $dsn .= '))(CONNECT_DATA=(SERVICE_NAME=' . $params['dbname'] . '))';
-            } else {
-                $dsn .= '))(CONNECT_DATA=(SID=' . $params['dbname'] . '))';
+                $database = 'SERVICE_NAME=' . $params['dbname'];
            }
+
            if (isset($params['pooled']) && $params['pooled'] == true) {
-                $dsn .= '(SERVER=POOLED)';
+                $pooled = '(SERVER=POOLED)';
            }
-            $dsn .= ')';
+
+            $dsn .= '))(CONNECT_DATA=(' . $database . ')' . $pooled . '))';
        } else {
            $dsn .= $params['dbname'];
        }