From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Sun, 18 Dec 2016 13:09:56 +0000 (+0100)
Subject: Fixed index on entry.uuid and changed uuid field type
X-Git-Tag: 2.2.0~3^2~16^2~2
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=8137515171a9b3c8e7c3720958acfdccb96803f7

Fixed index on entry.uuid and changed uuid field type
---

diff --git a/.travis.yml b/.travis.yml
index 8c8093bf..7468b116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,14 @@ services:
   - redis
 
 # faster builds on docker-container setup
-sudo: false
+sudo: required
 
 # used for HHVM
 addons:
   apt:
     packages:
       - tidy
+  postgresql: 9.5
 
 # cache vendor dirs
 cache:
@@ -59,6 +60,7 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - composer self-update --no-progress
     - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+    - if [[ $DB = pgsql ]]; then psql -U postgres wallabag_test -c 'create extension "uuid-ossp";'; fi;
 
 install:
     - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
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"})
      */
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index c347cca5..10cda475 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -816,6 +816,7 @@ class EntryControllerTest extends WallabagCoreTestCase
 
         // generating the uuid
         $client->request('GET', '/share/'.$content->getId());
+        var_dump($client->getResponse()->getContent());
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
 
         // follow link with uuid