Set mail and password as optional fields

[airbundle] / Resources / config / doctrine / User.orm.yml

diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml
index d1e133622cd3370798a5033efd6e93c058017c81..8a9b7de6fcf787cb82a6b63bd8b832038c40b6fb 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -3,22 +3,20 @@ Rapsys\AirBundle\Entity\User:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:
-        phone:
+        pseudonym:
             type: string
-            length: 16
+            length: 32
             nullable: true
-        donation:
+        phone:
             type: string
-            length: 254
+            length: 16
             nullable: true
-        site:
+        slug:
             type: string
-            length: 254
+            unique: true
+            length: 32
             nullable: true
     oneToMany:
-#        votes:
-#            targetEntity: Rapsys\AirBundle\Entity\Vote
-#            mappedBy: user
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             mappedBy: user
@@ -26,11 +24,22 @@ Rapsys\AirBundle\Entity\User:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user
     manyToMany:
+        dances:
+            targetEntity: Rapsys\AirBundle\Entity\Dance
+            inversedBy: users
+            joinTable:
+                name: users_dances
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: dance_id
         subscribers:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: subscriptions
             joinTable:
-                name: subscriptions
+                name: users_subscriptions
                 joinColumns:
                     id:
                         name: user_id
@@ -40,6 +49,17 @@ Rapsys\AirBundle\Entity\User:
         subscriptions:
             targetEntity: Rapsys\AirBundle\Entity\User
             mappedBy: subscribers
+        locations:
+            targetEntity: Rapsys\AirBundle\Entity\Location
+            inversedBy: users
+            joinTable:
+                name: users_locations
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: location_id
 #    manyToMany:
 #        groups:
 #            targetEntity: Group
@@ -49,7 +69,7 @@ Rapsys\AirBundle\Entity\User:
     associationOverride:
         groups:
             joinTable:
-                name: groups_users
+                name: users_groups
                 joinColumns:
                     id:
                         name: user_id