Forward #3695

Merge branch 'eminetto-fix_oracle' into develop
zendframework · Apr 16, 2013 · fa1dce4 · fa1dce4
2 parents 1821930 + 1c2dd77
commit fa1dce4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/library/Zend/Db/Adapter/Adapter.php b/library/Zend/Db/Adapter/Adapter.php
@@ -309,7 +309,7 @@ protected function createDriver($parameters)
 
     /**
      * @param Driver\DriverInterface $driver
-     * @return Platform\PlatformInterface
+     * @return Platform\PlatformInterface 
      */
     protected function createPlatform($parameters)
     {

diff --git a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -41,7 +41,9 @@ public function __construct($primaryKeyField, $sequenceName)
         $this->sequenceName    = $sequenceName;
     }
 
-
+    /**
+     * @param  Insert $insert 
+     */
     public function preInsert(Insert $insert)
     {
         $columns = $insert->getRawState('columns');
@@ -56,10 +58,7 @@ public function preInsert(Insert $insert)
         if ($this->sequenceValue === null)
             return $insert;
 
-        array_push($columns, $this->primaryKeyField);
-        array_push($values, $this->sequenceValue);
-        $insert->columns($columns);
-        $insert->values($values);
+        $insert->values(array($this->primaryKeyField => $this->sequenceValue),  Insert::VALUES_MERGE);  
         return $insert;
     }