From fdb9fb1c2b5d35974188eb9344d87e0a41c75ca8 Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Sat, 15 Oct 2011 19:23:36 +0200
Subject: [PATCH] AssignedGenerator can always tell what field is missing an id

---
 lib/Doctrine/ORM/Id/AssignedGenerator.php | 4 ++--
 lib/Doctrine/ORM/ORMException.php         | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php
index 0143a157f..90a35fa12 100644
--- a/lib/Doctrine/ORM/Id/AssignedGenerator.php
+++ b/lib/Doctrine/ORM/Id/AssignedGenerator.php
@@ -78,10 +78,10 @@ class AssignedGenerator extends AbstractIdGenerator
                     $identifier[$idField] = $value;
                 }
             } else {
-                throw ORMException::entityMissingAssignedId($entity);
+                throw ORMException::entityMissingAssignedIdForField($entity, $idField);
             }
         }
 
         return $identifier;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php
index b28c8d32d..c156893c5 100644
--- a/lib/Doctrine/ORM/ORMException.php
+++ b/lib/Doctrine/ORM/ORMException.php
@@ -46,14 +46,6 @@ class ORMException extends Exception
         );
     }
 
-    public static function entityMissingAssignedId($entity)
-    {
-        return new self("Entity of type " . get_class($entity) . " is missing an assigned ID. " .
-            "The identifier generation strategy for this entity requires the ID field to be populated before ".
-            "EntityManager#persist() is called. If you want automatically generated identifiers instead " .
-            "you need to adjust the metadata mapping accordingly."
-        );
-    }
     public static function entityMissingAssignedIdForField($entity, $field)
     {
         return new self("Entity of type " . get_class($entity) . " is missing an assigned ID for field  '" . $field . "'. " .