Skip to content

Commit cb9ee13

Browse files
committed
Add db_charset to config.
1 parent 159f1c7 commit cb9ee13

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

bin/db-pull.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ ROOT=$(cd $(dirname $0)/../ && pwd)
1515
cd ${LOCAL_SERVER_PATH}
1616

1717
echo "===== Check wp-config.php ====="
18-
wp config path || wp config create --dbname=${LOCAL_DB_NAME} --dbuser=${LOCAL_DB_USER} --dbpass=${LOCAL_DB_PASSWORD} --dbhost=${LOCAL_DB_HOST}
18+
wp config path || wp config create --dbname=${LOCAL_DB_NAME} --dbuser=${LOCAL_DB_USER} --dbpass=${LOCAL_DB_PASSWORD} --dbhost=${LOCAL_DB_HOST} --dbcharset=${DB_CHARSET}
1919

2020
echo "===== Exporting local database =========="
2121
wp db export local.sql
2222
echo $(ls -la local.sql)
2323

2424
echo "===== Exporting remote database ====="
2525
if [ -n "${SSH_CONFIG}" ]; then
26-
ssh ${SSH_CONFIG} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 --no-tablespaces ${DB_NAME}" > remote.sql
26+
ssh ${SSH_CONFIG} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} --no-tablespaces ${DB_NAME}" > remote.sql
2727
else
28-
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 --no-tablespaces ${DB_NAME}" > remote.sql
28+
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} --no-tablespaces ${DB_NAME}" > remote.sql
2929
fi
3030
echo $(ls -la remote.sql)
3131

bin/db-push.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ cd ${LOCAL_SERVER_PATH}
1616

1717
echo "===== Exporting remote database ====="
1818
if [ -n "${SSH_CONFIG}" ]; then
19-
ssh ${SSH_CONFIG} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 --no-tablespaces ${DB_NAME}" > remote.sql
19+
ssh ${SSH_CONFIG} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} --no-tablespaces ${DB_NAME}" > remote.sql
2020
else
21-
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 --no-tablespaces ${DB_NAME}" > remote.sql
21+
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysqldump --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} --no-tablespaces ${DB_NAME}" > remote.sql
2222
fi
2323
echo $(ls -la remote.sql)
2424

@@ -32,7 +32,7 @@ wp db import local.sql
3232

3333
echo "===== Importing to remote database from local database =========="
3434
if [ -n "${SSH_CONFIG}" ]; then
35-
ssh ${SSH_CONFIG} "mysql --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 ${DB_NAME}" < for-remote.sql
35+
ssh ${SSH_CONFIG} "mysql --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} ${DB_NAME}" < for-remote.sql
3636
else
37-
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysql --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=utf8 ${DB_NAME}" < for-remote.sql
37+
ssh ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} "mysql --host=${DB_HOST} --user=${DB_USER} --password=\"${DB_PASSWORD}\" --default-character-set=${DB_CHARSET} ${DB_NAME}" < for-remote.sql
3838
fi

bin/variables.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
set -e;
44

5+
# Encoding
6+
DB_CHARSET=$(cat ${CONFIG_PATH} | jq -r ".db_charset")
7+
58
# Remote
69
DB_HOST=$(cat ${CONFIG_PATH} | jq -r ".${ENVIRONMENT}.mysql.host")
710
DB_NAME=$(cat ${CONFIG_PATH} | jq -r ".${ENVIRONMENT}.mysql.name")

config-sample.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"db_charset": "utf8",
23
"production": {
34
"mysql": {
45
"host": "localhost",

0 commit comments

Comments
 (0)