Rename user group join table to users_groups

[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..fc6431c1b2da3f589a53200588d4ea4fc31d93fc 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -7,18 +7,7 @@ Rapsys\AirBundle\Entity\User:
             type: string
             length: 16
             nullable: true
-        donation:
-            type: string
-            length: 254
-            nullable: true
-        site:
-            type: string
-            length: 254
-            nullable: true
     oneToMany:
-#        votes:
-#            targetEntity: Rapsys\AirBundle\Entity\Vote
-#            mappedBy: user
         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             mappedBy: user
@@ -30,7 +19,7 @@ Rapsys\AirBundle\Entity\User:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: subscriptions
             joinTable:
-                name: subscriptions
+                name: users_subscriptions
                 joinColumns:
                     id:
                         name: user_id
@@ -40,6 +29,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 +49,7 @@ Rapsys\AirBundle\Entity\User:
     associationOverride:
         groups:
             joinTable:
-                name: groups_users
+                name: users_groups
                 joinColumns:
                     id:
                         name: user_id