From ac8187c2b2c71d4c7ace45180257a812881d5ebb Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 10 Apr 2024 01:25:53 +0900
Subject: [PATCH] =?UTF-8?q?docker-compose.mysql.yml=20=E3=81=AE=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=20mysql:8.0=20?=
 =?UTF-8?q?=E3=81=B8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.mysql.yml | 2 +-
 eccube_install.sh        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
index 9ba2db1abd..1a0b7f8537 100644
--- a/docker-compose.mysql.yml
+++ b/docker-compose.mysql.yml
@@ -35,7 +35,7 @@ services:
       PASSWORD_HASH_ALGOS: sha256
 
   mysql:
-    image: mysql:5.7
+    image: mysql:8.0
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
     ports:
       - '13306:3306'
diff --git a/eccube_install.sh b/eccube_install.sh
index e7008ac233..025f2c2189 100755
--- a/eccube_install.sh
+++ b/eccube_install.sh
@@ -269,16 +269,16 @@ case "${DBTYPE}" in
     #${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "GRANT ALL ON \`${DBNAME}\`.* TO '${DBUSER}'@'%' IDENTIFIED BY '${DBPASS}'"
     echo "create table..."
     echo "SET SESSION default_storage_engine = InnoDB; SET sql_mode = 'NO_ENGINE_SUBSTITUTION';" |
-        cat - ${SQL_DIR}/create_table_mysqli.sql |
+        cat - ${SQL_DIR}/create_table_mysqli.sql | sed -e 's/rank/`rank`/g' |
         ${MYSQL} -h ${DBSERVER} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
     echo "insert data..."
     echo "SET CHARACTER SET 'utf8';" |
-        cat - ${SQL_DIR}/insert_data.sql |
+        cat - ${SQL_DIR}/insert_data.sql | sed -e 's/rank/`rank`/g' |
         ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
     echo "create sequence table..."
     create_sequence_tables
     echo "execute optional SQL..."
-    get_optional_sql | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
+    get_optional_sql | sed -e 's/rank/`rank`/g' | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
 ;;
 esac