From 62fbe90fc7c14c165de4042f3b998fc9d0845ed4 Mon Sep 17 00:00:00 2001
From: davidc <davidc@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 3 Jul 2007 22:56:56 +0000
Subject: [PATCH] Better sequence handling, making sure we are using DEFAULT
 VALUES with identify set to off.. we turn it off (identity insert, then we
 insert).

---
 lib/Doctrine/Sequence/Mssql.php | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/Doctrine/Sequence/Mssql.php b/lib/Doctrine/Sequence/Mssql.php
index 92a3330d0..5f9a60051 100644
--- a/lib/Doctrine/Sequence/Mssql.php
+++ b/lib/Doctrine/Sequence/Mssql.php
@@ -47,11 +47,12 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
 
 
         if ($this->checkSequence($sequenceName)) {
-            $query = 'SET IDENTITY_INSERT ' . $sequenceName . ' ON '
-                   . 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
+            $query = 'SET IDENTITY_INSERT ' . $sequenceName . ' OFF '
+                   . 'INSERT INTO ' . $sequenceName . 'DEFAULT VALUES';
         } else {
             $query = 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
         }
+        
         try {
 
             $this->conn->exec($query);
@@ -66,7 +67,16 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
                 } 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
+                
+                /**
+                 * This could actually be a table that starts at 18.. oh well..
+                 * we will keep the fallback to return 1 in case we skip this.. which
+                 * should really not happen.. otherwise the returned values is biased.
+                 */
+                if ($this->checkSequence($seqName)) {
+                    return $this->lastInsertId($seqName);
+                }
+                
                 return 1;
             }
             throw $e;
@@ -76,13 +86,14 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
 
         if (is_numeric($value)) {
             $query = 'DELETE FROM ' . $sequenceName . ' WHERE ' . $seqcolName . ' < ' . $value;
-            $this->conn->exec($query);
-            /**
-            TODO: is the following needed ?
-            if (PEAR::isError($result)) {
-                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
+            
+            try {
+                $this->conn->exec($query);
+            } catch (Doctrine_Connection_Exception $e) {
+                throw new Doctrine_Sequence_Exception('Could not delete previous sequence from ' . $sequenceName . 
+                                                      ' at ' . __FILE__ . ' in ' . __FUNCTION__ . ' with the message: ' .
+                                                      $e->getMessage());
             }
-            */
         }
         return $value;
     }