Fix coalesce warning

[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..fcc5712ab64019680e735b7b42974b1d4a6528ae 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:
     repositoryClass: Rapsys\AirBundle\Repository\UserRepository
     table: users
     fields:

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

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

-        donation:
+        pseudonym:

             type: string
             type: string

-            length: 254
+            length: 32

             nullable: true
             nullable: true

-        site:
+        zipcode:

             type: string
             type: string

-            length: 254
+            length: 5

             nullable: true
     oneToMany:
             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
         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:
     manyToMany:

-        subscribers:
-            targetEntity: Rapsys\AirBundle\Entity\User
-            inversedBy: subscriptions
+        dances:
+            targetEntity: Rapsys\AirBundle\Entity\Dance
+            inversedBy: users

             joinTable:
             joinTable:

-                name: subscriptions
+                name: users_dances

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

-                        name: subscriber_id
+                        name: dance_id
+        subscribers:
+            targetEntity: Rapsys\AirBundle\Entity\User
+            mappedBy: subscriptions

         subscriptions:
             targetEntity: Rapsys\AirBundle\Entity\User
         subscriptions:
             targetEntity: Rapsys\AirBundle\Entity\User

-            mappedBy: subscribers
+            inversedBy: subscribers
+            joinTable:
+                name: users_subscriptions
+                joinColumns:
+                    id:
+                        name: user_id
+                inverseJoinColumns:
+                    id:
+                        name: subscribed_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


@@ -49,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