Use entity full namespace instead of dropped entity short syntax

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

diff --git a/Resources/config/doctrine/User.orm.yml b/Resources/config/doctrine/User.orm.yml
index 0c505f6471ca635e884557d51dff5b1c0bb2c7df..600265143341e2a5fcc2e992288a715081cc4781 100644 (file)
--- a/Resources/config/doctrine/User.orm.yml
+++ b/Resources/config/doctrine/User.orm.yml
@@ -1,18 +1,75 @@
 Rapsys\AirBundle\Entity\User:
     type: entity
 Rapsys\AirBundle\Entity\User:
     type: entity

-    #repositoryClass: Rapsys\AirBundle\Repository\UserRepository
+    repositoryClass: Rapsys\AirBundle\Repository\UserRepository

     table: users
     fields:
     table: users
     fields:

+        city:
+            type: string
+            length: 64
+            nullable: true

         phone:
             type: string
             length: 16
         phone:
             type: string
             length: 16

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

     oneToMany:
     oneToMany:

-        votes:
-            targetEntity: Rapsys\AirBundle\Entity\Vote
-            mappedBy: user

         applications:
             targetEntity: Rapsys\AirBundle\Entity\Application
             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
+            mappedBy: subscriptions
+        subscriptions:
+            targetEntity: Rapsys\AirBundle\Entity\User
+            inversedBy: subscribers
+            joinTable:
+                name: users_subscriptions
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: subscriber_id
+        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
 #    manyToMany:
 #        groups:
 #            targetEntity: Group


@@ -22,7 +79,7 @@ Rapsys\AirBundle\Entity\User:
     associationOverride:
         groups:
             joinTable:
     associationOverride:
         groups:
             joinTable:

-                name: groups_users
+                name: users_groups

                 joinColumns:
                     id:
                         name: user_id
                 joinColumns:
                     id:
                         name: user_id