Remove getAlias function

[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..600265143341e2a5fcc2e992288a715081cc4781 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -3,43 +3,73 @@ Rapsys\AirBundle\Entity\User:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:
+        city:
+            type: string
+            length: 64
+            nullable: true
         phone:
             type: string
             length: 16
             nullable: true
-        donation:
+        pseudonym:
             type: string
-            length: 254
+            length: 32
             nullable: true
-        site:
+        zipcode:
             type: string
-            length: 254
+            length: 5
             nullable: true
     oneToMany:
-#        votes:
-#            targetEntity: Rapsys\AirBundle\Entity\Vote
-#            mappedBy: user
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             mappedBy: user
         snippets:
             targetEntity: Rapsys\AirBundle\Entity\Snippet
             mappedBy: user
+        googleTokens:
+            targetEntity: Rapsys\AirBundle\Entity\GoogleToken
+            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
+            mappedBy: subscriptions
+        subscriptions:
+            targetEntity: Rapsys\AirBundle\Entity\User
+            inversedBy: subscribers
             joinTable:
-                name: subscriptions
+                name: users_subscriptions
                 joinColumns:
                     id:
                         name: user_id
                 inverseJoinColumns:
                     id:
                         name: subscriber_id
-        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
+    manyToOne:
+        country:
+            targetEntity: Rapsys\AirBundle\Entity\Country
+            inversedBy: users
 #    manyToMany:
 #        groups:
 #            targetEntity: Group
@@ -49,7 +79,7 @@ Rapsys\AirBundle\Entity\User:
     associationOverride:
         groups:
             joinTable:
-                name: groups_users
+                name: users_groups
                 joinColumns:
                     id:
                         name: user_id