From c391287cc4909f38f6114403f466f2b3c83b0c48 Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Tue, 8 Nov 2011 18:36:18 -0200
Subject: [PATCH] More optimizations and increased code readability in Id
 Generators.

---
 lib/Doctrine/ORM/Id/SequenceGenerator.php | 9 ++++++---
 lib/Doctrine/ORM/Id/TableGenerator.php    | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php
index 0d564ed32..dd7de60ba 100644
--- a/lib/Doctrine/ORM/Id/SequenceGenerator.php
+++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php
@@ -59,10 +59,12 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
         if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
             // Allocate new values
             $conn = $em->getConnection();
-            $sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName);
+            $sql  = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName);
+            
             $this->_nextValue = $conn->fetchColumn($sql);
-            $this->_maxValue = $this->_nextValue + $this->_allocationSize;
+            $this->_maxValue  = $this->_nextValue + $this->_allocationSize;
         }
+        
         return $this->_nextValue++;
     }
 
@@ -90,13 +92,14 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
     {
         return serialize(array(
             'allocationSize' => $this->_allocationSize,
-            'sequenceName' => $this->_sequenceName
+            'sequenceName'   => $this->_sequenceName
         ));
     }
 
     public function unserialize($serialized)
     {
         $array = unserialize($serialized);
+        
         $this->_sequenceName = $array['sequenceName'];
         $this->_allocationSize = $array['allocationSize'];
     }
diff --git a/lib/Doctrine/ORM/Id/TableGenerator.php b/lib/Doctrine/ORM/Id/TableGenerator.php
index 5c46f8b5c..5c49344fe 100644
--- a/lib/Doctrine/ORM/Id/TableGenerator.php
+++ b/lib/Doctrine/ORM/Id/TableGenerator.php
@@ -50,11 +50,12 @@ class TableGenerator extends AbstractIdGenerator
         if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
             // Allocate new values
             $conn = $em->getConnection();
-            if ($conn->getTransactionNestingLevel() == 0) {
-
+            
+            if ($conn->getTransactionNestingLevel() === 0) {
                 // use select for update
-                $sql = $conn->getDatabasePlatform()->getTableHiLoCurrentValSql($this->_tableName, $this->_sequenceName);
+                $sql          = $conn->getDatabasePlatform()->getTableHiLoCurrentValSql($this->_tableName, $this->_sequenceName);
                 $currentLevel = $conn->fetchColumn($sql);
+                
                 if ($currentLevel != null) {
                     $this->_nextValue = $currentLevel;
                     $this->_maxValue = $this->_nextValue + $this->_allocationSize;
@@ -74,6 +75,7 @@ class TableGenerator extends AbstractIdGenerator
                 // or do we want to work with table locks exclusively?
             }
         }
+        
         return $this->_nextValue++;
     }
 }
\ No newline at end of file