mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851
This commit is contained in:
parent
206bade58a
commit
98efffc2a6
8 changed files with 15 additions and 9 deletions
|
@ -75,7 +75,7 @@ doctrine:
|
|||
dbname: "%database_name%"
|
||||
user: "%database_user%"
|
||||
password: "%database_password%"
|
||||
charset: UTF8
|
||||
charset: "%database_charset%"
|
||||
path: "%database_path%"
|
||||
unix_socket: "%database_socket%"
|
||||
server_version: 5.6
|
||||
|
|
|
@ -28,7 +28,7 @@ doctrine:
|
|||
dbname: "%test_database_name%"
|
||||
user: "%test_database_user%"
|
||||
password: "%test_database_password%"
|
||||
charset: UTF8
|
||||
charset: "%test_database_charset%"
|
||||
path: "%test_database_path%"
|
||||
orm:
|
||||
metadata_cache_driver:
|
||||
|
|
|
@ -19,16 +19,18 @@ parameters:
|
|||
database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
|
||||
database_table_prefix: wallabag_
|
||||
database_socket: null
|
||||
# with MySQL, use "utf8mb4" if got problem with content with emojis
|
||||
database_charset: utf8
|
||||
|
||||
mailer_transport: smtp
|
||||
mailer_host: 127.0.0.1
|
||||
mailer_user: ~
|
||||
mailer_password: ~
|
||||
mailer_transport: smtp
|
||||
mailer_host: 127.0.0.1
|
||||
mailer_user: ~
|
||||
mailer_password: ~
|
||||
|
||||
locale: en
|
||||
locale: en
|
||||
|
||||
# A secret key that's used to generate certain security-related tokens
|
||||
secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
|
||||
secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
|
||||
|
||||
# two factor stuff
|
||||
twofactor_auth: true
|
||||
|
|
|
@ -6,3 +6,4 @@ parameters:
|
|||
test_database_user: null
|
||||
test_database_password: null
|
||||
test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
|
||||
test_database_charset: utf8
|
||||
|
|
|
@ -6,3 +6,4 @@ parameters:
|
|||
test_database_user: root
|
||||
test_database_password: ~
|
||||
test_database_path: ~
|
||||
test_database_charset: utf8mb4
|
||||
|
|
|
@ -6,3 +6,4 @@ parameters:
|
|||
test_database_user: travis
|
||||
test_database_password: ~
|
||||
test_database_path: ~
|
||||
test_database_charset: utf8
|
||||
|
|
|
@ -6,3 +6,4 @@ parameters:
|
|||
test_database_user: ~
|
||||
test_database_password: ~
|
||||
test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
|
||||
test_database_charset: utf8mb4
|
||||
|
|
|
@ -19,7 +19,7 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
|
|||
*
|
||||
* @XmlRoot("entry")
|
||||
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
|
||||
* @ORM\Table(name="`entry`")
|
||||
* @ORM\Table(name="`entry`", options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"})
|
||||
* @ORM\HasLifecycleCallbacks()
|
||||
* @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue