Rename user group join table to users_groups

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

diff --git a/Resources/config/doctrine/Application.orm.yml b/Resources/config/doctrine/Application.orm.yml
index e65953d92d62a8fa574977d4bf8eaf38cc6b746c..e52cc6ea3926752c8f386148d13b97e673e2e3e4 100644 (file)
--- a/Resources/config/doctrine/Application.orm.yml
+++ b/Resources/config/doctrine/Application.orm.yml
@@ -10,9 +10,12 @@ Rapsys\AirBundle\Entity\Application:
             options:
                 unsigned: true
     fields:
             options:
                 unsigned: true
     fields:

-#The score computed at attribution time, the sum of all session score divided by proximity in days (1 for sun-thu, 2 for fri-sat, +1 for high temperature, *-1 for bad weather)/abs(DAY(attribution date - session.date))
-#        score:
-#            type: float
+        score:
+            type: float
+            nullable: true
+        canceled:
+            type: datetime
+            nullable: true

         created:
             type: datetime
         updated:
         created:
             type: datetime
         updated:


@@ -24,7 +27,13 @@ Rapsys\AirBundle\Entity\Application:
         user:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: applications
         user:
             targetEntity: Rapsys\AirBundle\Entity\User
             inversedBy: applications

-    oneToMany:
-        votes:
-            targetEntity: Rapsys\AirBundle\Entity\Vote
-            mappedBy: application
+#    oneToMany:
+#        votes:
+#            targetEntity: Rapsys\AirBundle\Entity\Vote
+#            mappedBy: application
+#    indexes:
+#        #XXX: used in SessionRepository::XXX
+#        id_user:
+#            columns: [ id, user_id ]
+#        id_user_canceled:
+#            columns: [ id, user_id, canceled ]