db-sync-tool-kmi 2.11.6__tar.gz → 2.11.8__tar.gz

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db_sync_tool-kmi
-Version: 2.11.6
+Version: 2.11.8
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/database/process.py

@@ -51,9 +51,9 @@ def create_origin_database_dump():
             _mysqldump_options = _mysqldump_options + f'{_additional} '
 
         # Run mysql dump command, e.g.
-        # MYSQL_PWD="db" mysqldump --no-tablespaces -u'db' -p'db' -h'db1' -P'3306' 'db'  > /tmp/_db_08-10-2021_07-00.sql
+        # mysqldump --no-tablespaces -u'db' -p'db' -h'db1' -P'3306' 'db'  > /tmp/_db_08-10-2021_07-00.sql
         mode.run_command(
-            'MYSQL_PWD="' + system.config[mode.Client.ORIGIN]['db']['password'] + '" ' + helper.get_command(mode.Client.ORIGIN, 'mysqldump') + ' ' + _mysqldump_options +
+            helper.get_command(mode.Client.ORIGIN, 'mysqldump') + ' ' + _mysqldump_options +
             database_utility.generate_mysql_credentials(mode.Client.ORIGIN) + ' \'' +
             system.config[mode.Client.ORIGIN]['db']['name'] + '\' ' +
             database_utility.generate_ignore_database_tables() +
@@ -149,7 +149,6 @@ def import_database_dump_file(client, filepath):
     """
     if helper.check_file_exists(client, filepath):
         mode.run_command(
-            'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' +
             helper.get_command(client, 'mysql') + ' ' +
             database_utility.generate_mysql_credentials(client) + ' \'' +
             system.config[client]['db']['name'] + '\' < ' + filepath,
@@ -208,13 +207,13 @@ def clear_database(client):
     :return:
     """
     mode.run_command(
-        '{ MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' + helper.get_command(client, 'mysql') + ' ' +
+        '{ ' + helper.get_command(client, 'mysql') + ' ' +
         database_utility.generate_mysql_credentials(client) +
         ' -Nse \'show tables\' \'' +
         system.config[client]['db']['name'] + '\'; }' +
         ' | ( while read table; do if [ -z ${i+x} ]; then echo \'SET FOREIGN_KEY_CHECKS = 0;\'; fi; i=1; ' +
         'echo "drop table \\`$table\\`;"; done; echo \'SET FOREIGN_KEY_CHECKS = 1;\' ) | awk \'{print}\' ORS=' ' | ' +
-        'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' +
+        ' ' +
         helper.get_command(client, 'mysql') + ' ' +
         database_utility.generate_mysql_credentials(client) + ' ' +
         system.config[client]['db']['name'],

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/database/utility.py

@@ -29,7 +29,7 @@ def run_database_command(client, command, force_database_name=False):
     _database_name = ' ' + system.config[client]['db']['name'] if force_database_name else ''
 
     return mode.run_command(
-        'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' + helper.get_command(client, 'mysql') + ' ' + generate_mysql_credentials(
+        helper.get_command(client, 'mysql') + ' ' + generate_mysql_credentials(
             client) + _database_name + ' -e "' + command + '"',
         client, True)
 
@@ -144,7 +144,7 @@ def get_database_tables():
     return _result
 
 
-def generate_mysql_credentials(client, force_password=False):
+def generate_mysql_credentials(client, force_password=True):
     """
     Generate the needed database credential information for the mysql command
     :param client: String

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/info.py

@@ -1,6 +1,6 @@
 """
 Info script
 """
-__version__ = "2.11.6"
+__version__ = "2.11.8"
 __pypi_package_url__ = "https://pypi.org/pypi/db-sync-tool-kmi"
 __homepage__ = "https://github.com/jackd248/db-sync-tool"

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/recipes/drupal.py

@@ -41,7 +41,7 @@ def check_configuration(client):
 
     _db_config = parse_database_credentials(json.loads(stdout))
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/recipes/laravel.py

@@ -15,13 +15,13 @@ def check_configuration(client):
     """
     _path = system.config[client]['path']
 
-    system.config[client]['db'] = {
+    system.config[client]['db'] = helper.clean_db_config({
         'name': get_database_parameter(client, 'DB_DATABASE', _path),
         'host': get_database_parameter(client, 'DB_HOST', _path),
         'password': get_database_parameter(client, 'DB_PASSWORD', _path),
         'port': get_database_parameter(client, 'DB_PORT', _path),
         'user': get_database_parameter(client, 'DB_USERNAME', _path),
-    }
+    })
 
 
 def get_database_parameter(client, name, file):

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/recipes/symfony.py

@@ -38,7 +38,7 @@ def check_configuration(client):
         )
         _db_config = parse_database_credentials(stdout)
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/recipes/typo3.py

@@ -59,7 +59,7 @@ def check_configuration(client):
             )
         )
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def parse_database_credentials(db_credentials):

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/recipes/wordpress.py

@@ -25,7 +25,7 @@ def check_configuration(client):
         'user': get_database_setting(client, 'DB_USER', system.config[client]['path']),
     }
 
-    system.config[client]['db'] = _db_config
+    system.config[client]['db'] = helper.clean_db_config(_db_config)
 
 
 def get_database_setting(client, name, file):

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool/utility/helper.py

@@ -323,3 +323,31 @@ def confirm(prompt=None, resp=False):
             return True
         if ans == 'n' or ans == 'N':
             return False
+
+
+def clean_db_config(config):
+    """
+    Iterates over all entries of a dictionary and removes enclosing inverted commas
+    from the values, if present.
+
+    :param config: The dictionary to be edited
+    :return: A new dictionary with adjusted values
+    """
+    # Iterate over all entries in the dictionary and use the inverted comma function
+    return {key: remove_surrounding_quotes(value) for key, value in config.items()}
+
+
+def remove_surrounding_quotes(s):
+    """
+    Removes the enclosing inverted commas (single or double),
+    if there are quotes at both the beginning and the end of the string.
+
+    :param s: The string to be checked
+    :return: The string without enclosing quotes, if available
+    """
+    if isinstance(s, str):
+        if s.startswith('"') and s.endswith('"'):
+            return s[1:-1]
+        elif s.startswith("'") and s.endswith("'"):
+            return s[1:-1]
+    return s

{db_sync_tool-kmi-2.11.6 → db_sync_tool-kmi-2.11.8}/db_sync_tool_kmi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: db-sync-tool-kmi
-Version: 2.11.6
+Version: 2.11.8
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik