Browse Source

Default UTF8MB4 for CREATE DATABASE

pull/3326/head
Alexandre Alapetite 3 years ago
parent
commit
a2a03c3f70
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      friendica_test_data.sql
  2. +1
    -1
      mod/install.php
  3. +1
    -1
      util/vagrant_provision.sh

+ 1
- 1
friendica_test_data.sql View File

@ -19,7 +19,7 @@
-- Current Database: `friendica`
--
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `friendica` /*!40100 DEFAULT CHARACTER SET latin1 */;
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `friendica` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci */;
USE `friendica`;


+ 1
- 1
mod/install.php View File

@ -48,7 +48,7 @@ function install_post(App $a) {
$db = new dba($dbhost, $dbuser, $dbpass, '', true);
if(! get_db_errno()) {
$r = q("CREATE DATABASE '%s'",
$r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci",
dbesc($dbdata)
);
if ($r) {


+ 1
- 1
util/vagrant_provision.sh View File

@ -100,7 +100,7 @@ sudo ln -fs /vagrant /var/www
cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
# create the friendica database
echo "create database friendica" | mysql -u root -proot
echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | mysql -u root -proot
# import test database
$MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql


Loading…
Cancel
Save