mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-30 04:51:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix emoji insertion in MySQL

Browse source 
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
This commit is contained in:
Jeremy Benoist 2016-10-01 10:52:13 +02:00
parent 206bade58a
commit 98efffc2a6
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
8 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/config.yml
View file

@ -75,7 +75,7 @@ doctrine:
dbname: "%database_name%" dbname: "%database_name%"
user: "%database_user%" user: "%database_user%"
password: "%database_password%" password: "%database_password%"
charset: UTF8 charset: "%database_charset%"
path: "%database_path%" path: "%database_path%"
unix_socket: "%database_socket%" unix_socket: "%database_socket%"
server_version: 5.6 server_version: 5.6

2
app/config/config_test.yml
View file

@ -28,7 +28,7 @@ doctrine:
dbname: "%test_database_name%" dbname: "%test_database_name%"
user: "%test_database_user%" user: "%test_database_user%"
password: "%test_database_password%" password: "%test_database_password%"
charset: UTF8 charset: "%test_database_charset%"
path: "%test_database_path%" path: "%test_database_path%"
orm: orm:
metadata_cache_driver: metadata_cache_driver:

2
app/config/parameters.yml.dist
View file

@ -19,6 +19,8 @@ parameters:
database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
database_table_prefix: wallabag_ database_table_prefix: wallabag_
database_socket: null database_socket: null
# with MySQL, use "utf8mb4" if got problem with content with emojis
database_charset: utf8
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1

1
app/config/parameters_test.yml
View file

@ -6,3 +6,4 @@ parameters:
test_database_user: null test_database_user: null
test_database_password: null test_database_password: null
test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
test_database_charset: utf8

1
app/config/tests/parameters_test.mysql.yml
View file

@ -6,3 +6,4 @@ parameters:
test_database_user: root test_database_user: root
test_database_password: ~ test_database_password: ~
test_database_path: ~ test_database_path: ~
test_database_charset: utf8mb4

1
app/config/tests/parameters_test.pgsql.yml
View file

@ -6,3 +6,4 @@ parameters:
test_database_user: travis test_database_user: travis
test_database_password: ~ test_database_password: ~
test_database_path: ~ test_database_path: ~
test_database_charset: utf8

1
app/config/tests/parameters_test.sqlite.yml
View file

@ -6,3 +6,4 @@ parameters:
test_database_user: ~ test_database_user: ~
test_database_password: ~ test_database_password: ~
test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
test_database_charset: utf8mb4

2
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -19,7 +19,7 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
* *
* @XmlRoot("entry") * @XmlRoot("entry")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
* @ORM\Table(name="`entry`") * @ORM\Table(name="`entry`", options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"})
* @ORM\HasLifecycleCallbacks() * @ORM\HasLifecycleCallbacks()
* @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
*/ */