diff options
author | Jeremy <jeremy.benoist@gmail.com> | 2015-03-28 11:29:19 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-04-01 21:32:02 +0200 |
commit | 164bd801188245942ca996eda75d7a554f29746a (patch) | |
tree | 6e4892446a97f9a2b38a781ca09154da93a82646 /src/Wallabag/CoreBundle/Entity | |
parent | 1a93ee423b072ec3bcb0c437cbf9b488bdea245c (diff) | |
download | wallabag-164bd801188245942ca996eda75d7a554f29746a.tar.gz wallabag-164bd801188245942ca996eda75d7a554f29746a.tar.zst wallabag-164bd801188245942ca996eda75d7a554f29746a.zip |
Ability to prefix tables
Will fix #799
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Config.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Tag.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/User.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index 9f079656..62ea637e 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraints as Assert; | |||
9 | * Config | 9 | * Config |
10 | * | 10 | * |
11 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository") | 11 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository") |
12 | * @ORM\Table(name="config") | 12 | * @ORM\Table |
13 | * @ORM\Entity | 13 | * @ORM\Entity |
14 | */ | 14 | */ |
15 | class Config | 15 | class Config |
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 75aeae84..15af105d 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -13,7 +13,7 @@ use JMS\Serializer\Annotation\XmlRoot; | |||
13 | * | 13 | * |
14 | * @XmlRoot("entry") | 14 | * @XmlRoot("entry") |
15 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") | 15 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") |
16 | * @ORM\Table(name="entry") | 16 | * @ORM\Table |
17 | * @ORM\HasLifecycleCallbacks() | 17 | * @ORM\HasLifecycleCallbacks() |
18 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") | 18 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") |
19 | */ | 19 | */ |
@@ -121,7 +121,7 @@ class Entry | |||
121 | 121 | ||
122 | /** | 122 | /** |
123 | * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"}) | 123 | * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"}) |
124 | * @ORM\JoinTable(name="entry_tags") | 124 | * @ORM\JoinTable |
125 | */ | 125 | */ |
126 | private $tags; | 126 | private $tags; |
127 | 127 | ||
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php index 9ae5867c..9d3c7a32 100644 --- a/src/Wallabag/CoreBundle/Entity/Tag.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php | |||
@@ -12,7 +12,7 @@ use Doctrine\Common\Collections\ArrayCollection; | |||
12 | * Tag | 12 | * Tag |
13 | * | 13 | * |
14 | * @XmlRoot("tag") | 14 | * @XmlRoot("tag") |
15 | * @ORM\Table(name="tag") | 15 | * @ORM\Table |
16 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TagRepository") | 16 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TagRepository") |
17 | * @ExclusionPolicy("all") | 17 | * @ExclusionPolicy("all") |
18 | */ | 18 | */ |
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index e75e3a83..1652170f 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php | |||
@@ -13,8 +13,8 @@ use JMS\Serializer\Annotation\Expose; | |||
13 | /** | 13 | /** |
14 | * User | 14 | * User |
15 | * | 15 | * |
16 | * @ORM\Table(name="user") | ||
17 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository") | 16 | * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository") |
17 | * @ORM\Table | ||
18 | * @ORM\HasLifecycleCallbacks() | 18 | * @ORM\HasLifecycleCallbacks() |
19 | * @ExclusionPolicy("all") | 19 | * @ExclusionPolicy("all") |
20 | */ | 20 | */ |