Add warning on pdo_oracle usage and implemented DBAL-141

doctrine · Oct 30, 2011 · 5be1613 · 5be1613
1 parent 08e6c48
commit 5be1613
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/OCI8/Driver.php b/lib/Doctrine/DBAL/Driver/OCI8/Driver.php
@@ -25,7 +25,7 @@
 
 /**
  * A Doctrine DBAL driver for the Oracle OCI8 PHP extensions.
- * 
+ *
  * @author Roman Borschel <[email protected]>
  * @since 2.0
  */
@@ -60,11 +60,11 @@ protected function _constructDsn(array $params)
                 $dsn .= '(PORT=1521)';
             }
 
-            $dsn .= '))';
-            if (isset($params['dbname'])) {
-                $dsn .= '(CONNECT_DATA=(SID=' . $params['dbname'] . ')';
+            if (isset($params['service']) && $params['service'] == true) {
+                $dsn .= '))(CONNECT_DATA=(SERVICE_NAME=' . $params['dbname'] . ')))';
+            } else {
+                $dsn .= '))(CONNECT_DATA=(SID=' . $params['dbname'] . ')))';
             }
-            $dsn .= '))';
         } else {
             $dsn .= $params['dbname'];
         }

diff --git a/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php b/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php
@@ -1,7 +1,5 @@
 <?php
 /*
- *  $Id$
- *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -23,6 +21,14 @@
 
 use Doctrine\DBAL\Platforms;
 
+/**
+ * PDO Oracle driver
+ *
+ * WARNING: This driver gives us segfauls in our testsuites on CLOB and other
+ * stuff. PDO Oracle is not maintained by Oracle or anyone in the PHP community,
+ * which leads us to the recommendation to use the "oci8" driver to connect
+ * to Oracle instead.
+ */
 class Driver implements \Doctrine\DBAL\Driver
 {
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
@@ -53,7 +59,11 @@ private function _constructPdoDsn(array $params)
                 $dsn .= '(PORT=1521)';
             }
 
-            $dsn .= '))(CONNECT_DATA=(SID=' . $params['dbname'] . ')))';
+            if (isset($params['service']) && $params['service'] == true) {
+                $dsn .= '))(CONNECT_DATA=(SERVICE_NAME=' . $params['dbname'] . ')))';
+            } else {
+                $dsn .= '))(CONNECT_DATA=(SID=' . $params['dbname'] . ')))';
+            }
         } else {
             $dsn .= 'dbname=' . $params['dbname'];
         }