From af09158d1252b968013216a204bbe0f22b72a85f Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 17 Jun 2007 17:50:05 +0000
Subject: [PATCH]
---
lib/Doctrine/Sequence/Db2.php | 6 +++---
lib/Doctrine/Sequence/Sqlite.php | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/Doctrine/Sequence/Db2.php b/lib/Doctrine/Sequence/Db2.php
index b4be65755..b6e882cf3 100644
--- a/lib/Doctrine/Sequence/Db2.php
+++ b/lib/Doctrine/Sequence/Db2.php
@@ -48,7 +48,7 @@ class Doctrine_Sequence_Db2 extends Doctrine_Sequence
. ' AS VAL FROM SYSIBM.SYSDUMMY1';
$stmt = $this->query($sql);
- $result = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
+ $result = $stmt->fetchAll(Doctrine::FETCH_ASSOC);
if ($result) {
return $result[0]['VAL'];
} else {
@@ -72,7 +72,7 @@ class Doctrine_Sequence_Db2 extends Doctrine_Sequence
. $this->quoteIdentifier($this->conn->formatter->getSequenceName($sequenceName))
. ' AS VAL FROM SYSIBM.SYSDUMMY1';
$stmt = $this->query($sql);
- $result = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
+ $result = $stmt->fetchAll(Doctrine::FETCH_ASSOC);
if ($result) {
return $result[0]['VAL'];
} else {
@@ -113,7 +113,7 @@ class Doctrine_Sequence_Db2 extends Doctrine_Sequence
$sql = 'SELECT IDENTITY_VAL_LOCAL() AS VAL FROM SYSIBM.SYSDUMMY1';
$stmt = $this->query($sql);
- $result = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
+ $result = $stmt->fetchAll(Doctrine::FETCH_ASSOC);
if ($result) {
return $result[0]['VAL'];
} else {
diff --git a/lib/Doctrine/Sequence/Sqlite.php b/lib/Doctrine/Sequence/Sqlite.php
index 75fa88008..9639cbd4a 100644
--- a/lib/Doctrine/Sequence/Sqlite.php
+++ b/lib/Doctrine/Sequence/Sqlite.php
@@ -65,6 +65,7 @@ class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
// First ID of a newly created sequence is 1
return 1;
}
+ throw $e;
}
$value = $this->conn->getDbh()->lastInsertId();