From 564b97e2aab05a2f3fc91b3538b34e191ae3e89e Mon Sep 17 00:00:00 2001 From: Dimitar Yanakiev Date: Sat, 5 Apr 2025 22:58:25 +0300 Subject: [PATCH] fix: add missing backticks in Blade for MySQL/MariaDB database names with hyphens (#523) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: add missing backticks in Blade for MySQL/MariaDB database names with hyphens Before: The CREATE DATABASE command failed for database names containing hyphens (-) because MySQL/MariaDB requires backticks around such names, but they were missing in the Blade template. After: Backticks (```) are now correctly added in the Blade template, ensuring MySQL properly interprets database names with hyphens. Why: MySQL/MariaDB does not allow hyphens in database names unless they are enclosed in backticks. The Blade template was missing these backticks, causing syntax errors. Adding them ensures the command executes successfully. 🚀 * fix: added hyphens to other places as well --------- Co-authored-by: Saeed Vaziry <61919774+saeedvaziry@users.noreply.github.com> --- resources/views/ssh/services/database/mariadb/backup.blade.php | 2 +- resources/views/ssh/services/database/mariadb/create.blade.php | 2 +- resources/views/ssh/services/database/mariadb/delete.blade.php | 2 +- resources/views/ssh/services/database/mariadb/link.blade.php | 2 +- resources/views/ssh/services/database/mariadb/restore.blade.php | 2 +- resources/views/ssh/services/database/mysql/backup.blade.php | 2 +- resources/views/ssh/services/database/mysql/create.blade.php | 2 +- resources/views/ssh/services/database/mysql/delete.blade.php | 2 +- resources/views/ssh/services/database/mysql/link.blade.php | 2 +- resources/views/ssh/services/database/mysql/restore.blade.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/views/ssh/services/database/mariadb/backup.blade.php b/resources/views/ssh/services/database/mariadb/backup.blade.php index 64a9e27..87d8c1a 100644 --- a/resources/views/ssh/services/database/mariadb/backup.blade.php +++ b/resources/views/ssh/services/database/mariadb/backup.blade.php @@ -1,4 +1,4 @@ -if ! sudo DEBIAN_FRONTEND=noninteractive mysqldump -u root {{ $database }} > {{ $file }}.sql; then +if ! sudo DEBIAN_FRONTEND=noninteractive mysqldump -u root \`{{ $database }}\` > {{ $file }}.sql; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mariadb/create.blade.php b/resources/views/ssh/services/database/mariadb/create.blade.php index 51dc05b..c0e663d 100644 --- a/resources/views/ssh/services/database/mariadb/create.blade.php +++ b/resources/views/ssh/services/database/mariadb/create.blade.php @@ -1,4 +1,4 @@ -if ! sudo mariadb -e "CREATE DATABASE IF NOT EXISTS {{ $name }} CHARACTER SET '{{ $charset }}' COLLATE '{{ $collation }}'"; then +if ! sudo mariadb -e "CREATE DATABASE IF NOT EXISTS \`{{ $name }}\` CHARACTER SET '{{ $charset }}' COLLATE '{{ $collation }}'"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mariadb/delete.blade.php b/resources/views/ssh/services/database/mariadb/delete.blade.php index 406fad5..ebc48b1 100644 --- a/resources/views/ssh/services/database/mariadb/delete.blade.php +++ b/resources/views/ssh/services/database/mariadb/delete.blade.php @@ -1,4 +1,4 @@ -if ! sudo mariadb -e "DROP DATABASE IF EXISTS {{ $name }}"; then +if ! sudo mariadb -e "DROP DATABASE IF EXISTS \`{{ $name }}\`"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mariadb/link.blade.php b/resources/views/ssh/services/database/mariadb/link.blade.php index 8bea57e..c461b10 100644 --- a/resources/views/ssh/services/database/mariadb/link.blade.php +++ b/resources/views/ssh/services/database/mariadb/link.blade.php @@ -1,4 +1,4 @@ -if ! sudo mariadb -e "GRANT ALL PRIVILEGES ON {{ $database }}.* TO '{{ $username }}'@'{{ $host }}'"; then +if ! sudo mariadb -e "GRANT ALL PRIVILEGES ON \`{{ $database }}\`.* TO '{{ $username }}'@'{{ $host }}'"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mariadb/restore.blade.php b/resources/views/ssh/services/database/mariadb/restore.blade.php index 782749d..99f68eb 100644 --- a/resources/views/ssh/services/database/mariadb/restore.blade.php +++ b/resources/views/ssh/services/database/mariadb/restore.blade.php @@ -2,7 +2,7 @@ echo 'VITO_SSH_ERROR' && exit 1 fi -if ! sudo DEBIAN_FRONTEND=noninteractive mariadb -u root {{ $database }} < {{ $file }}.sql; then +if ! sudo DEBIAN_FRONTEND=noninteractive mariadb -u root \`{{ $database }}\` < {{ $file }}.sql; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mysql/backup.blade.php b/resources/views/ssh/services/database/mysql/backup.blade.php index 64a9e27..87d8c1a 100644 --- a/resources/views/ssh/services/database/mysql/backup.blade.php +++ b/resources/views/ssh/services/database/mysql/backup.blade.php @@ -1,4 +1,4 @@ -if ! sudo DEBIAN_FRONTEND=noninteractive mysqldump -u root {{ $database }} > {{ $file }}.sql; then +if ! sudo DEBIAN_FRONTEND=noninteractive mysqldump -u root \`{{ $database }}\` > {{ $file }}.sql; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mysql/create.blade.php b/resources/views/ssh/services/database/mysql/create.blade.php index da09ba8..9061349 100755 --- a/resources/views/ssh/services/database/mysql/create.blade.php +++ b/resources/views/ssh/services/database/mysql/create.blade.php @@ -1,4 +1,4 @@ -if ! sudo mysql -e "CREATE DATABASE IF NOT EXISTS {{ $name }} CHARACTER SET '{{ $charset }}' COLLATE '{{ $collation }}'"; then +if ! sudo mysql -e "CREATE DATABASE IF NOT EXISTS \`{{ $name }}\` CHARACTER SET '{{ $charset }}' COLLATE '{{ $collation }}'"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mysql/delete.blade.php b/resources/views/ssh/services/database/mysql/delete.blade.php index 0130f47..a75643f 100755 --- a/resources/views/ssh/services/database/mysql/delete.blade.php +++ b/resources/views/ssh/services/database/mysql/delete.blade.php @@ -1,4 +1,4 @@ -if ! sudo mysql -e "DROP DATABASE IF EXISTS {{ $name }}"; then +if ! sudo mysql -e "DROP DATABASE IF EXISTS \`{{ $name }}\`"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mysql/link.blade.php b/resources/views/ssh/services/database/mysql/link.blade.php index ce547f2..d5eaf1c 100755 --- a/resources/views/ssh/services/database/mysql/link.blade.php +++ b/resources/views/ssh/services/database/mysql/link.blade.php @@ -1,4 +1,4 @@ -if ! sudo mysql -e "GRANT ALL PRIVILEGES ON {{ $database }}.* TO '{{ $username }}'@'{{ $host }}'"; then +if ! sudo mysql -e "GRANT ALL PRIVILEGES ON \`{{ $database }}\`.* TO '{{ $username }}'@'{{ $host }}'"; then echo 'VITO_SSH_ERROR' && exit 1 fi diff --git a/resources/views/ssh/services/database/mysql/restore.blade.php b/resources/views/ssh/services/database/mysql/restore.blade.php index c158f58..3b47865 100644 --- a/resources/views/ssh/services/database/mysql/restore.blade.php +++ b/resources/views/ssh/services/database/mysql/restore.blade.php @@ -2,7 +2,7 @@ echo 'VITO_SSH_ERROR' && exit 1 fi -if ! sudo DEBIAN_FRONTEND=noninteractive mysql -u root {{ $database }} < {{ $file }}.sql; then +if ! sudo DEBIAN_FRONTEND=noninteractive mysql -u root \`{{ $database }}\` < {{ $file }}.sql; then echo 'VITO_SSH_ERROR' && exit 1 fi