db-sync-tool-kmi 2.11.6__py3-none-any.whl → 2.11.8__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → db_sync_tool_kmi-2.11.8.dist-info}/METADATA

@@ -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.dist-info → db_sync_tool_kmi-2.11.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 db_sync_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/__main__.py,sha256=-pD13j2oYcKLhPprLy-LQeDCapj-FKrV3CDFHuYJu3g,11541
-db_sync_tool/info.py,sha256=Dp0DluuDEA_8H2BV2Iq4vzULDRDfH_phTf_FU9DoNkc,165
+db_sync_tool/info.py,sha256=oltTVrkzR98MZMAvIQoE1Y5IIg-VIr2BIY0E1LyPANc,165
 db_sync_tool/sync.py,sha256=WMfMts0M8z3oecI-HL07xG9ktbba8D8h7_U-8tBwizY,2087
 db_sync_tool/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db_sync_tool/database/process.py,sha256=zmaKkxMVLYG3kr7S9rUUuxE1fgsdKasRNOhxZgSfzvg,8357
-db_sync_tool/database/utility.py,sha256=EfxWwHUsS6hVIMD4Jrz3n2_HQNBn3pB2GWo6OpWph4k,7783
+db_sync_tool/database/process.py,sha256=djOnNnwEswkmPbnJVsI3SvPSwzcZgAapighh3Ew5heE,8069
+db_sync_tool/database/utility.py,sha256=MRvTfF0ZCdcDW1EfIwIJR4ZtemxTBasOf45q5hor6vs,7717
 db_sync_tool/recipes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db_sync_tool/recipes/drupal.py,sha256=jlWuSQQeoLkVBq6nqka853QnEyy2ZO_08o5mfkv0jDo,1481
-db_sync_tool/recipes/laravel.py,sha256=-iF-2SHh5tOKuOC4C2qQMdz_sn9gm0-TBN9XpiYEuC4,1151
-db_sync_tool/recipes/symfony.py,sha256=rk2epXLEBLfsNTiV5G43JUnJtjn5-JTtnhQFi-tgmJQ,2493
-db_sync_tool/recipes/typo3.py,sha256=7ThFTkqN086FcpYv_aUhxMTEKh2JQl6BB5VrFzNrEWA,4737
-db_sync_tool/recipes/wordpress.py,sha256=Cdjc10c30shHAG8WpQeFvhl8fojHeCto3UInRLb9FFU,1444
+db_sync_tool/recipes/drupal.py,sha256=jAo1d3vxZ4UZ4Vzk308Dsmn1--ORmVO2g87l8OpQoPw,1505
+db_sync_tool/recipes/laravel.py,sha256=kp_gnKG0iyX_rzM0GW7Ca9ZPV3oGfEgGsLvJR_0pVDo,1175
+db_sync_tool/recipes/symfony.py,sha256=8ObIRXdoBG1MbWD7pd1TxUQboz5LUWbfzz3TX6F9G5w,2517
+db_sync_tool/recipes/typo3.py,sha256=7IejOtxASfskymG5jBFKmEzjl2sON3miKo_78Oqvi2g,4761
+db_sync_tool/recipes/wordpress.py,sha256=KN3HTzDbs5p2GD7vvTEhBl7xNOiy2YHrXhVLmiF_y_A,1468
 db_sync_tool/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/remote/client.py,sha256=wjcoQ1jp9i8PMO_6XX2XMXZCoLXy-ySA38seZtY-Sns,6553
 db_sync_tool/remote/rsync.py,sha256=VsLbCCgZRSXjmYz5o7B_OpKPna0X1WFqlr-irLN83EY,4252
@@ -18,7 +18,7 @@ db_sync_tool/remote/system.py,sha256=A9OIaypETMYx7frTKpXBgja-kXj7vSD6gJs8pUNpL_I
 db_sync_tool/remote/transfer.py,sha256=pYVsad4SKkJ0TgZHcyLc17Z9xK6exdyO7R8TBe4qQcQ,5872
 db_sync_tool/remote/utility.py,sha256=knTfzFKLdw2QsirvTfTz76XmckagKURKVBhjyREsQIo,3580
 db_sync_tool/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db_sync_tool/utility/helper.py,sha256=KSnps4JQHc-wUmi8HNqI1d836R4ZUiQJo94t1gYNFuo,7987
+db_sync_tool/utility/helper.py,sha256=zf1dPKgb5loLcOUtinjHdY9D_E6Gp5kLjbS8R-bRrxw,8905
 db_sync_tool/utility/info.py,sha256=8VdUMi3fsyykfMKKrmgUVoW9WEHPXbzPkVNHOIsNAMo,2976
 db_sync_tool/utility/log.py,sha256=OdJsVKyvJqQYl5NUzb5bIg1uhUJ9kj7c7kT9oKbGvo8,869
 db_sync_tool/utility/mode.py,sha256=DAkt-N5sYr6r2iTL_1sWu7_WHq04DNO4YjvBLkU3LeA,8588
@@ -26,9 +26,9 @@ db_sync_tool/utility/output.py,sha256=uoiWE7Pm8qv1a3vrBupZHE545d1uZSQHiLAUgkHofL
 db_sync_tool/utility/parser.py,sha256=DIdWVGyiltyH8akoWyyXLvUmFPR-nvBrnzDctPJzgKw,6624
 db_sync_tool/utility/system.py,sha256=G74lWGFcJNmLr0l6-GkZWmkk7q3icv4MccuHFKP_Vsw,18539
 db_sync_tool/utility/validation.py,sha256=qZNPgkTwV_kJTNtFh0OXb2FHrsWPnDA2W_fftWs5hZc,3530
-db_sync_tool_kmi-2.11.6.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
-db_sync_tool_kmi-2.11.6.dist-info/METADATA,sha256=x_N_6SPFgsNz7wlvuDziLpUbgkz9LkHrwCk3E3dQbH8,12505
-db_sync_tool_kmi-2.11.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-db_sync_tool_kmi-2.11.6.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
-db_sync_tool_kmi-2.11.6.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
-db_sync_tool_kmi-2.11.6.dist-info/RECORD,,
+db_sync_tool_kmi-2.11.8.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
+db_sync_tool_kmi-2.11.8.dist-info/METADATA,sha256=EGxuPJ7XlzkctysvkkSIu8oqC7Wt1KvcHzx_ljWaiBE,12505
+db_sync_tool_kmi-2.11.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+db_sync_tool_kmi-2.11.8.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
+db_sync_tool_kmi-2.11.8.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
+db_sync_tool_kmi-2.11.8.dist-info/RECORD,,