From 01f27fb3787a4f2ab3fe7eb4a31f9940a220a2e9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 16 Jun 2024 16:26:04 +0200 Subject: [PATCH] helpers2.1: misc fixes --- tools/helpers2.1/convert_to_helpers_2.1.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/helpers2.1/convert_to_helpers_2.1.py b/tools/helpers2.1/convert_to_helpers_2.1.py index b4f4f9db..2d5a2486 100644 --- a/tools/helpers2.1/convert_to_helpers_2.1.py +++ b/tools/helpers2.1/convert_to_helpers_2.1.py @@ -103,6 +103,8 @@ def cleanup(): (r"ynh_psql_dump_db \S*\$db_name\"?\s", "ynh_psql_dump_db "), (r"ynh_mysql_connect_as [^<\\]*\s", "ynh_mysql_db_shell "), (r"ynh_psql_connect_as [^<\\]*\s", "ynh_psql_db_shell "), + (r'ynh_mysql_execute_as_root --sql=?', 'ynh_mysql_db_shell <<< '), + (r'ynh_psql_execute_as_root --sql=?', 'ynh_psql_db_shell <<< "'), (r'ynh_mysql_execute_as_root "', 'ynh_mysql_db_shell <<< "'), (r'ynh_psql_execute_as_root "', 'ynh_psql_db_shell <<< "'), (r"ynh_mysql_execute_as_root '", "ynh_mysql_db_shell <<< '"), @@ -114,8 +116,9 @@ def cleanup(): (r'ynh_mysql_execute_file_as_root --file=\"?(\S+)\"? --database=\"?(\S+)\"?', 'ynh_mysql_db_shell "\\2" < "\\1"'), (r'ynh_psql_execute_file_as_root --database=\"?(\S+)\"? --file=\"?(\S+)\"?', 'ynh_psql_db_shell "\\1" < "\\2"'), (r'ynh_psql_execute_file_as_root --file=\"?(\S+)\"? --database=\"?(\S+)\"?', 'ynh_psql_db_shell "\\2" < "\\1"'), - (r'sql_db_shell "?$db_name"?', "sql_db_shell "), - (r'--database="?$db_name"?', ""), + (r'sql_db_shell "?\$db_name"?', "sql_db_shell "), + (r'--database="?\$db_name"?', ""), + (r'--database="?\$app"?', ""), (r"ynh_mysql_setup_db", "# FIXME ynh_mysql_create_db"), (r"ynh_mysql_remove_db", "# FIXME ynh_mysql_drop_db && ynh_mysql_drop_user"), (r"ynh_psql_setup_db", "# FIXME ynh_psql_create_db"),