Add country, city and zipcode member

Drop slug member

diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml
index 8a9b7de6fcf787cb82a6b63bd8b832038c40b6fb..b6161cbf983cd1aa8467b99de01526dd340c36af 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -3,19 +3,22 @@ Rapsys\AirBundle\Entity\User:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:

-        pseudonym:
+        city:

             type: string
             type: string

-            length: 32
+            length: 64

             nullable: true
         phone:
             type: string
             length: 16
             nullable: true
             nullable: true
         phone:
             type: string
             length: 16
             nullable: true

-        slug:
+        pseudonym:

             type: string
             type: string

-            unique: true

             length: 32
             nullable: true
             length: 32
             nullable: true

+        zipcode:
+            type: string
+            length: 5
+            nullable: true

     oneToMany:
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
     oneToMany:
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application


@@ -60,6 +63,10 @@ Rapsys\AirBundle\Entity\User:
                 inverseJoinColumns:
                     id:
                         name: location_id
                 inverseJoinColumns:
                     id:
                         name: location_id

+    manyToOne:
+        country:
+            targetEntity: Rapsys\AirBundle\Entity\Country
+            inversedBy: users

 #    manyToMany:
 #        groups:
 #            targetEntity: Group
 #    manyToMany:
 #        groups:
 #            targetEntity: Group