Doctrine

Timestamp:

09/18/08 10:31:18 (10 months ago)

Author:

adrive

Message:

Fixed #1466: fixed Oracle's lastInsertId()

Location:

branches/1.0

Files:

• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Sequence/Oracle.php (modified) (1 diff)
• tests/Sequence/OracleTestCase.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Connection/UnitOfWork.php

@@ -591 +591 @@
         if (empty($seq) && count($identifier) == 1 && $identifier[0] == $table->getIdentifier() &&
             $table->getIdentifierType() != Doctrine::IDENTIFIER_NATURAL) {
-            if (strtolower($this->conn->getDriverName()) == 'pgsql') {
+            if (($driver = strtolower($this->conn->getDriverName())) == 'pgsql') {
                 $seq = $table->getTableName() . '_' . $identifier[0];
+            } elseif ($driver == 'oracle') {
+                $seq = $table->getTableName();
             }
 

branches/1.0/lib/Doctrine/Sequence/Oracle.php

@@ -75 +75 @@
         $sequenceName =  $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true);
 
-        return $this->conn->fetchOne('SELECT ' . $sequenceName . '.currval');
+        return $this->conn->fetchOne('SELECT ' . $sequenceName . '.currval FROM DUAL');
     }
 

branches/1.0/tests/Sequence/OracleTestCase.php

@@ -51 +51 @@
         $this->sequence->lastInsertId('user');
         
-        $this->assertEqual($this->adapter->pop(), 'SELECT user_seq.currval');
+        $this->assertEqual($this->adapter->pop(), 'SELECT user_seq.currval FROM DUAL');
     }
 }