Merge branch 'hotfix/3912'

Close #4240 Fixes #3912
zendframework · Apr 16, 2013 · 1913f89 · 1913f89
2 parents 27f6cba + d11db3b
commit 1913f89
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -42,7 +42,7 @@ public function __construct($primaryKeyField, $sequenceName)
     }
 
     /**
-     * @param  Insert $insert 
+     * @param  Insert $insert
      */
     public function preInsert(Insert $insert)
     {
@@ -55,17 +55,19 @@ public function preInsert(Insert $insert)
         }
 
         $this->sequenceValue = $this->nextSequenceId();
-        if ($this->sequenceValue === null)
+        if ($this->sequenceValue === null) {
             return $insert;
+        }
 
-        $insert->values(array($this->primaryKeyField => $this->sequenceValue),  Insert::VALUES_MERGE);  
+        $insert->values(array($this->primaryKeyField => $this->sequenceValue),  Insert::VALUES_MERGE);
         return $insert;
     }
 
     public function postInsert(StatementInterface $statement, ResultInterface $result)
     {
-        if ($this->sequenceValue !== null)
+        if ($this->sequenceValue !== null) {
             $this->tableGateway->lastInsertValue = $this->sequenceValue;
+        }
     }
 
     /**
@@ -77,7 +79,6 @@ public function nextSequenceId()
         $platform = $this->tableGateway->adapter->getPlatform();
         $platformName = $platform->getName();
 
-        $sql = '';
         switch ($platformName) {
             case 'Oracle':
                 $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.NEXTVAL FROM dual';
@@ -92,7 +93,7 @@ public function nextSequenceId()
         $statement = $this->tableGateway->adapter->createStatement();
         $statement->prepare($sql);
         $result = $statement->execute();
-        $sequence = $result->getResource()->fetch(\PDO::FETCH_ASSOC);
+        $sequence = $result->current();
         unset($statement, $result);
         return $sequence['nextval'];
     }
@@ -106,7 +107,6 @@ public function lastSequenceId()
         $platform = $this->tableGateway->adapter->getPlatform();
         $platformName = $platform->getName();
 
-        $sql = '';
         switch ($platformName) {
             case 'Oracle':
                 $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.CURRVAL FROM dual';
@@ -121,7 +121,7 @@ public function lastSequenceId()
         $statement = $this->tableGateway->adapter->createStatement();
         $statement->prepare($sql);
         $result = $statement->execute();
-        $sequence = $result->getResource()->fetch(\PDO::FETCH_ASSOC);
+        $sequence = $result->current();
         unset($statement, $result);
         return $sequence['currval'];
     }