Skip to content

Commit e680bfc

Browse files
authored
Merge pull request #311 from infosiftr/escape-database-wildcard
Add wildcard escaping fix similar to MySQL
2 parents f1c39c6 + 1dc8ff1 commit e680bfc

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

10.1/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

10.2/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

10.3/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

10.4/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

10.5/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ docker_setup_db() {
258258

259259
if [ -n "$MYSQL_DATABASE" ]; then
260260
mysql_note "Giving user ${MYSQL_USER} access to schema ${MYSQL_DATABASE}"
261-
docker_process_sql --database=mysql <<<"GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;"
261+
docker_process_sql --database=mysql <<<"GRANT ALL ON \`${MYSQL_DATABASE//_/\\_}\`.* TO '$MYSQL_USER'@'%' ;"
262262
fi
263263

264264
docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"

0 commit comments

Comments
 (0)