From 658f73f045faeef6ad96408d816118e041bb5c32 Mon Sep 17 00:00:00 2001
From: lsmith <lsmith@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 10 Jan 2008 15:02:24 +0000
Subject: [PATCH] - use same implementation as MySQL

---
 lib/Doctrine/Sequence/Sqlite.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/Doctrine/Sequence/Sqlite.php b/lib/Doctrine/Sequence/Sqlite.php
index 19ca392a9..3affb8854 100644
--- a/lib/Doctrine/Sequence/Sqlite.php
+++ b/lib/Doctrine/Sequence/Sqlite.php
@@ -53,31 +53,25 @@ class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
 
         } catch(Doctrine_Connection_Exception $e) {
             if ($onDemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
-                // Since we are creating the sequence on demand
-                // we know the first id = 1 so initialize the
-                // sequence at 2
-
                 try {
-                    $result = $this->conn->export->createSequence($seqName, 2);
+                    $this->conn->export->createSequence($seqName);
+                    return $this->nextId($seqName, false);
                 } catch(Doctrine_Exception $e) {
                     throw new Doctrine_Sequence_Exception('on demand sequence ' . $seqName . ' could not be created');
                 }
-                // First ID of a newly created sequence is 1
-                return 1;
             }
             throw $e;
         }
 
-        $value = $this->conn->getDbh()->lastInsertId();
+        $value = $this->lastInsertId();
 
         if (is_numeric($value)) {
             $query = 'DELETE FROM ' . $sequenceName . ' WHERE ' . $seqcolName . ' < ' . $value;
-            
-            $this->conn->exec($query);
-            /**
-            TODO: is the following needed ?
-            $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
-            */
+            try {
+                $this->conn->exec($query);
+            } catch(Doctrine_Exception $e) {
+                throw new Doctrine_Sequence_Exception('could not delete previous sequence table values from ' . $seqName);
+            }
         }
         return $value;
     }
@@ -111,4 +105,4 @@ class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
 
         return (int) $this->conn->fetchOne($query);
     }
-}
\ No newline at end of file
+}