Rapsys Git
/
airbundle
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove short title
[airbundle]
/
Resources
/
config
/
doctrine
/
User.orm.yml
diff --git
a/Resources/config/doctrine/User.orm.yml
b/Resources/config/doctrine/User.orm.yml
index dacee58c6dfec0ea437942a378dadd2fce858cc7..fc6431c1b2da3f589a53200588d4ea4fc31d93fc 100644
(file)
--- a/
Resources/config/doctrine/User.orm.yml
+++ b/
Resources/config/doctrine/User.orm.yml
@@
-19,7
+19,7
@@
Rapsys\AirBundle\Entity\User:
targetEntity: Rapsys\AirBundle\Entity\User
inversedBy: subscriptions
joinTable:
targetEntity: Rapsys\AirBundle\Entity\User
inversedBy: subscriptions
joinTable:
- name: subscriptions
+ name:
users_
subscriptions
joinColumns:
id:
name: user_id
joinColumns:
id:
name: user_id
@@
-29,6
+29,17
@@
Rapsys\AirBundle\Entity\User:
subscriptions:
targetEntity: Rapsys\AirBundle\Entity\User
mappedBy: subscribers
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
# manyToMany:
# groups:
# targetEntity: Group
@@
-38,7
+49,7
@@
Rapsys\AirBundle\Entity\User:
associationOverride:
groups:
joinTable:
associationOverride:
groups:
joinTable:
- name:
groups_user
s
+ name:
users_group
s
joinColumns:
id:
name: user_id
joinColumns:
id:
name: user_id