From 7ac08931bc0aa510aa0bd3e99b30d4184ed6eb7d Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Fri, 14 May 2010 12:31:25 -0400
Subject: [PATCH 1/4] Fixing DatabaseDriver to specify nullable => true instead
 of notnull => false

---
 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
index 083583ac7..df6a5823f 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
@@ -100,7 +100,7 @@ class DatabaseDriver implements Driver
             } else if ($column->getType() instanceof \Doctrine\DBAL\Types\IntegerType) {
                 $fieldMapping['unsigned'] = $column->getUnsigned();
             }
-            $fieldMapping['notnull'] = $column->getNotNull();
+            $fieldMapping['nullable'] = $column->getNotNull() ? false : true;
 
             if (isset($fieldMapping['id'])) {
                 $ids[] = $fieldMapping;

From 464accecfe116b3d69ec376f8b8c3b5018b35181 Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Fri, 14 May 2010 12:33:17 -0400
Subject: [PATCH 2/4] Fixing wrong variable name.

---
 .../ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
index 2af1eb04b..a82824a17 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
@@ -136,7 +136,7 @@ EOT
         $converter = new ConvertDoctrine1Schema($fromPaths);
         $metadata = $converter->getMetadata();
 
-        if ($metadatas) {
+        if ($metadata) {
             $output->write(PHP_EOL);
 
             foreach ($metadata as $class) {

From 5a92c0b51e02f207449c1929da0afb18129bdd7c Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Fri, 14 May 2010 12:38:42 -0400
Subject: [PATCH 3/4] Fixing issue with reverse engineering databases.

---
 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
index df6a5823f..7dc6cb8cd 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
@@ -78,13 +78,6 @@ class DatabaseDriver implements Driver
         $ids = array();
         $fieldMappings = array();
         foreach ($columns as $column) {
-            // Skip columns that are foreign keys
-            foreach ($foreignKeys as $foreignKey) {
-                if (in_array(strtolower($column->getName()), array_map('strtolower', $foreignKey->getColumns()))) {
-                    continue(2);
-                }
-            }
-
             $fieldMapping = array();
             if (isset($indexes['primary']) && in_array($column->getName(), $indexes['primary']->getColumns())) {
                 $fieldMapping['id'] = true;

From edf096eb57437521bbc40e49bcfc3fdbd747b501 Mon Sep 17 00:00:00 2001
From: David Abdemoulaie <github@hobodave.com>
Date: Fri, 14 May 2010 14:21:46 -0500
Subject: [PATCH 4/4] [DDC-588] EntityManager::refresh uses fieldName instead
 of columnName

---
 lib/Doctrine/ORM/UnitOfWork.php               |  2 +-
 .../ORM/Functional/Ticket/DDC588Test.php      | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 6bf7d6691..948ee1be2 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1480,7 +1480,7 @@ class UnitOfWork implements PropertyChangedListener
         $class = $this->_em->getClassMetadata(get_class($entity));
         if ($this->getEntityState($entity) == self::STATE_MANAGED) {
             $this->getEntityPersister($class->name)->refresh(
-                array_combine($class->getIdentifierColumnNames(), $this->_entityIdentifiers[$oid]),
+                array_combine($class->getIdentifierFieldNames(), $this->_entityIdentifiers[$oid]),
                 $entity
             );
         } else {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
new file mode 100644
index 000000000..3f899d786
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
@@ -0,0 +1,48 @@
+<?php
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC588Site'),
+        ));
+    }
+
+    public function testIssue()
+    {
+        $site = new DDC588Site('Foo');
+
+        $this->_em->persist($site);
+        $this->_em->flush();
+        // Following should not result in exception
+        $this->_em->refresh($site);
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC588Site
+{
+    /**
+     * @Id
+     * @Column(type="integer", name="site_id")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @Column(type="string", length=45)
+     */
+    protected $name = null;
+
+    public function __construct($name = '')
+    {
+        $this->name = $name;
+    }
+}