aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-18 14:09:56 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-25 10:51:25 +0100
commit8137515171a9b3c8e7c3720958acfdccb96803f7 (patch)
tree1372f72cec1cd20fef3f8b625656896bbbf79726 /src
parentaf131cb513584a2bbc992dfcaa756a5b425dbe50 (diff)
downloadwallabag-8137515171a9b3c8e7c3720958acfdccb96803f7.tar.gz
wallabag-8137515171a9b3c8e7c3720958acfdccb96803f7.tar.zst
wallabag-8137515171a9b3c8e7c3720958acfdccb96803f7.zip
Fixed index on entry.uuid and changed uuid field type
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php3
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php8
2 files changed, 8 insertions, 3 deletions
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
355 { 355 {
356 $this->checkUserAction($entry); 356 $this->checkUserAction($entry);
357 357
358 $version = $this->getDoctrine()->getManager()->getConnection()->query('SELECT version();')->fetchColumn();
359 var_dump($version);
360
358 return $this->render( 361 return $this->render(
359 'WallabagCoreBundle:Entry:entry.html.twig', 362 'WallabagCoreBundle:Entry:entry.html.twig',
360 ['entry' => $entry] 363 ['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;
22 * @ORM\Table( 22 * @ORM\Table(
23 * name="`entry`", 23 * name="`entry`",
24 * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, 24 * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
25 * indexes={@ORM\Index(name="created_at", columns={"created_at"})}, 25 * indexes={
26 * indexes={@ORM\Index(name="uuid", columns={"uuid"})} 26 * @ORM\Index(name="created_at", columns={"created_at"}),
27 * @ORM\Index(name="uuid", columns={"uuid"})
28 * }
27 * ) 29 * )
28 * @ORM\HasLifecycleCallbacks() 30 * @ORM\HasLifecycleCallbacks()
29 * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") 31 * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
@@ -45,7 +47,7 @@ class Entry
45 /** 47 /**
46 * @var string 48 * @var string
47 * 49 *
48 * @ORM\Column(name="uuid", type="text", nullable=true) 50 * @ORM\Column(name="uuid", type="guid", nullable=true)
49 * 51 *
50 * @Groups({"entries_for_user", "export_all"}) 52 * @Groups({"entries_for_user", "export_all"})
51 */ 53 */