pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

mysql: change collation of tag table

Browse Source 
utf8mb4_unicode_ci considers that 'caché' is equal to 'cache' which
can lead to attaching incorrect tags to entries. This issue is due to
some unicode normalization done by MySQL.

utf8mb4_bin makes no unicode normalization, letting wallabag to consider
'cache' and 'caché' as two different tags.

We change the collation of the whole table as Doctrine does not support
setting a collation on a column for a specific platform (it tries to
apply utf8mb4_bin even for pgsql and sqlite).

Fixes #3302

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf
2019-05-11 20:07:38 +02:00
parent de1162b91a
commit feb239ea10
3 changed files with 80 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View File

@ -221,4 +221,50 @@ class TagControllerTest extends WallabagCoreTestCase
$this->assertInstanceOf(Tag::class, $newTag, 'Tag "specific label" exists.');
$this->assertTrue($newTag->hasEntry($freshEntry), 'Tag "specific label" is assigned to the entry.');
}
public function testAddUnicodeTagLabel()
{
$this->logInAs('admin');
$client = $this->getClient();
$entry = new Entry($this->getLoggedInUser());
$entry->setUrl('http://0.0.0.0/tag-caché');
$this->getEntityManager()->persist($entry);
$this->getEntityManager()->flush();
$this->getEntityManager()->clear();
$crawler = $client->request('GET', '/view/' . $entry->getId());
$form = $crawler->filter('form[name=tag]')->form();
$data = [
'tag[label]' => 'cache',
];
$client->submit($form, $data);
$crawler = $client->request('GET', '/view/' . $entry->getId());
$form = $crawler->filter('form[name=tag]')->form();
$data = [
'tag[label]' => 'caché',
];
$client->submit($form, $data);
$newEntry = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->find($entry->getId());
$tags = $newEntry->getTags()->toArray();
foreach ($tags as $key => $tag) {
$tags[$key] = $tag->getLabel();
}
$this->assertGreaterThanOrEqual(2, \count($tags));
$this->assertNotFalse(array_search('cache', $tags, true), 'Tag cache is assigned to the entry');
$this->assertNotFalse(array_search('caché', $tags, true), 'Tag caché is assigned to the entry');
}
}