From 4a39754e76ae0a205aeb5df797850d75e977e91c Mon Sep 17 00:00:00 2001
From: Dick Marinus <dick@mrns.nl>
Date: Tue, 30 Jun 2015 19:56:07 +0200
Subject: [PATCH] unsigned is in fieldMapping['options']

---
 lib/Doctrine/ORM/Tools/EntityGenerator.php                  | 2 +-
 .../ORM/Tools/Export/AbstractClassMetadataExporterTest.php  | 2 ++
 .../annotation/Doctrine.Tests.ORM.Tools.Export.User.php     | 6 +++++-
 .../Export/php/Doctrine.Tests.ORM.Tools.Export.User.php     | 5 +++++
 .../Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml | 5 +++++
 .../yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml       | 4 ++++
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
index f425c877c..45b048a71 100644
--- a/lib/Doctrine/ORM/Tools/EntityGenerator.php
+++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -1652,7 +1652,7 @@ public function __construct(<params>)
 
             $options = [];
 
-            if (isset($fieldMapping['unsigned']) && $fieldMapping['unsigned']) {
+            if (isset($fieldMapping['options']['unsigned']) && $fieldMapping['options']['unsigned']) {
                 $options[] = '"unsigned"=true';
             }
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
index 7c3c33c6a..fd68bb6c4 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
@@ -206,6 +206,8 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
         $this->assertEquals('user_email', $class->fieldMappings['email']['columnName']);
         $this->assertEquals('CHAR(32) NOT NULL', $class->fieldMappings['email']['columnDefinition']);
 
+        $this->assertEquals(true, $class->fieldMappings['age']['options']['unsigned']);
+
         return $class;
     }
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php
index 3bac8c2ae..344708059 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php
@@ -22,6 +22,11 @@ class User
      */
     public $email;
 
+    /**
+     * @Column(type="integer", options={"unsigned"=true})
+     */
+    public $age;
+
     /**
      * @OneToOne(targetEntity="Doctrine\Tests\ORM\Tools\Export\Address", inversedBy="user", cascade={"persist"}, orphanRemoval=true, fetch="EAGER")
      * @JoinColumn(name="address_id", onDelete="CASCADE")
@@ -49,7 +54,6 @@ class User
      */
     public $groups;
 
-
     /**
      * @PrePersist
      */
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
index 061934b9b..8dc8e874d 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php
@@ -31,6 +31,11 @@ $metadata->mapField(array(
    'columnName' => 'user_email',
    'columnDefinition' => 'CHAR(32) NOT NULL',
   ));
+$metadata->mapField(array(
+   'fieldName' => 'age',
+   'type' => 'integer',
+   'options' => array("unsigned"=>true),
+  ));
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
 $metadata->mapManyToOne(array(
     'fieldName' => 'mainGroup',
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml
index 8e30948e8..70b1a8dae 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml
@@ -24,6 +24,11 @@
 
         <field name="name" column="name" type="string" length="50" nullable="true" unique="true" />
         <field name="email" column="user_email" type="string" column-definition="CHAR(32) NOT NULL" />
+        <field name="age" type="integer">
+            <options>
+                <option name="unsigned">1</option>
+            </options>
+        </field>
 
         <one-to-one field="address" target-entity="Doctrine\Tests\ORM\Tools\Export\Address" inversed-by="user" orphan-removal="true" fetch="EAGER">
             <cascade><cascade-persist /></cascade>
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
index 1a5b77609..76c3902d6 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
@@ -19,6 +19,10 @@ Doctrine\Tests\ORM\Tools\Export\User:
       type: string
       column: user_email
       columnDefinition: CHAR(32) NOT NULL
+    age:
+      type: integer
+      options:
+        unsigned: true
   oneToOne:
     address:
       targetEntity: Doctrine\Tests\ORM\Tools\Export\Address