From 8137515171a9b3c8e7c3720958acfdccb96803f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 18 Dec 2016 14:09:56 +0100 Subject: Fixed index on entry.uuid and changed uuid field type --- src/Wallabag/CoreBundle/Controller/EntryController.php | 3 +++ src/Wallabag/CoreBundle/Entity/Entry.php | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle') diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index b03f49ed..83148671 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -355,6 +355,9 @@ class EntryController extends Controller { $this->checkUserAction($entry); + $version = $this->getDoctrine()->getManager()->getConnection()->query('SELECT version();')->fetchColumn(); + var_dump($version); + return $this->render( 'WallabagCoreBundle:Entry:entry.html.twig', ['entry' => $entry] diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 8dcc7190..4c22cf9c 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -22,8 +22,10 @@ use Wallabag\AnnotationBundle\Entity\Annotation; * @ORM\Table( * name="`entry`", * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, - * indexes={@ORM\Index(name="created_at", columns={"created_at"})}, - * indexes={@ORM\Index(name="uuid", columns={"uuid"})} + * indexes={ + * @ORM\Index(name="created_at", columns={"created_at"}), + * @ORM\Index(name="uuid", columns={"uuid"}) + * } * ) * @ORM\HasLifecycleCallbacks() * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") @@ -45,7 +47,7 @@ class Entry /** * @var string * - * @ORM\Column(name="uuid", type="text", nullable=true) + * @ORM\Column(name="uuid", type="guid", nullable=true) * * @Groups({"entries_for_user", "export_all"}) */ -- cgit v1.2.3