From 681cfede215a0795f64dbe468637c7f0cae50c83 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 13 Jun 2024 13:06:22 +0200 Subject: [PATCH] helpers2.1: more patches for mysql/psql helpers --- tools/helpers2.1/convert_to_helpers_2.1.py | 21 +++++++++++++++++++-- 1 file changed, 19 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 4a101f10..b4f4f9db 100644 --- a/tools/helpers2.1/convert_to_helpers_2.1.py +++ b/tools/helpers2.1/convert_to_helpers_2.1.py @@ -101,8 +101,25 @@ def cleanup(): # MySQL/Postgresql (r"ynh_mysql_dump_db \S*\$db_name\"?\s", "ynh_mysql_dump_db "), (r"ynh_psql_dump_db \S*\$db_name\"?\s", "ynh_psql_dump_db "), - (r"ynh_mysql_connect_as [^<\\]*\s", "ynh_mysql_execute "), - (r"ynh_mysql_execute_as_root \"", "ynh_mysql_execute_as_root --sql=\""), + (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 "', 'ynh_mysql_db_shell <<< "'), + (r'ynh_psql_execute_as_root "', '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_psql_execute_as_root --database=?", "ynh_psql_db_shell "), + (r"ynh_mysql_execute_as_root --database=?", "ynh_psql_db_shell "), + (r"--sql=", "<<< "), + (r'ynh_mysql_execute_file_as_root --database=\"?(\S+)\"? --file=\"?(\S+)\"?', 'ynh_mysql_db_shell "\\1" < "\\2"'), + (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"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"), + (r"ynh_psql_remove_db", "# FIXME ynh_psql_drop_db && ynh_psql_drop_user"), # PHP / composer (r" ?--phpversion=\S*", ""), (r" ?--composerversion=\S*", ""),