Merge branch 'hamilok-oracle_fix' into develop

bnkr · Feb 6, 2013 · 25764a3 · 25764a3
2 parents 5a632e4 + 97477fe
commit 25764a3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/library/Zend/Db/Adapter/Driver/Oci8/Connection.php b/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
@@ -122,11 +122,11 @@ public function getCurrentSchema()
             $this->connect();
         }
 
-        $query = "SELECT sys_context('USERENV', 'DB_NAME') as \"database_name\" FROM DUAL";
+        $query = "SELECT sys_context('USERENV', 'CURRENT_SCHEMA') as \"current_schema\" FROM DUAL";
         $stmt = oci_parse($this->resource, $query);
         oci_execute($stmt);
         $dbNameArray = oci_fetch_array($stmt, OCI_ASSOC);
-        return $dbNameArray['database_name'];
+        return $dbNameArray['current_schema'];
     }
 
     /**
@@ -158,15 +158,12 @@ public function getResource()
     /**
      * Connect
      *
-     * @return null
+     * @return Connection
      */
     public function connect()
     {
-        // @todo
-
-
         if (is_resource($this->resource)) {
-            return;
+            return $this;
         }
 
         // localize
@@ -182,15 +179,24 @@ public function connect()
             return null;
         };
 
-        // $hostname = $findParameterValue(array('hostname', 'host_name', ';host'));
-        $username = $findParameterValue(array('username', 'user'));
+        // http://www.php.net/manual/en/function.oci-connect.php
+        $username = $findParameterValue(array('username'));
         $password = $findParameterValue(array('password'));
-        $connectString = $findParameterValue(array('connection_string', 'connectionstring', 'connection', 'instance'));
-        //$service = $findParameterValue(array('service_name', 'service', 'db', 'schema'));
-        //$port     = (isset($p['port'])) ? (int) $p['port'] : null;
-        //$socket   = (isset($p['socket'])) ? $p['socket'] : null;
+        $connectionString = $findParameterValue(array('connection_string', 'connectionstring', 'connection', 'hostname', 'instance'));
+        $characterSet = $findParameterValue(array('character_set', 'charset', 'encoding'));
+
+        // connection modifiers
+        $isUnique = $findParameterValue(array('unique'));
+        $isPersistent = $findParameterValue(array('persistent'));
+
+        if ($isUnique == true) {
+            $this->resource = oci_new_connect($username, $password, $connectionString, $characterSet);
+        } elseif ($isPersistent == true) {
+            $this->resource = oci_pconnect($username, $password, $connectionString, $characterSet);
+        } else {
+            $this->resource = oci_connect($username, $password, $connectionString, $characterSet);
+        }
 
-        $this->resource = oci_connect($username, $password, $connectString);
         if (!$this->resource) {
             $e = oci_error();
             throw new Exception\RuntimeException(
@@ -199,6 +205,7 @@ public function connect()
                 new Exception\ErrorException($e['message'], $e['code'])
             );
         }
+
         return $this;
     }
 

diff --git a/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
@@ -282,6 +282,9 @@ protected function bindParametersFromContainer()
                             $value = (int) $value;
                         }
                         break;
+                    case ParameterContainer::TYPE_BINARY:
+                        $type = SQLT_BIN;
+                        break;
                     case ParameterContainer::TYPE_STRING:
                     default:
                         $type = SQLT_CHR;

diff --git a/library/Zend/Db/Adapter/ParameterContainer.php b/library/Zend/Db/Adapter/ParameterContainer.php
@@ -16,6 +16,7 @@ class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
     const TYPE_NULL    = 'null';
     const TYPE_DOUBLE  = 'double';
     const TYPE_INTEGER = 'integer';
+    const TYPE_BINARY  = 'binary';
     const TYPE_STRING  = 'string';
     const TYPE_LOB     = 'lob';