db-sync-tool-kmi 2.11.7__py3-none-any.whl → 2.11.9__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of db-sync-tool-kmi might be problematic. Click here for more details.

Files changed (10) hide show
  1. db_sync_tool/database/process.py +4 -5
  2. db_sync_tool/database/utility.py +2 -2
  3. db_sync_tool/info.py +1 -1
  4. db_sync_tool/recipes/typo3.py +9 -7
  5. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/METADATA +23 -10
  6. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/RECORD +10 -10
  7. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/WHEEL +1 -1
  8. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/entry_points.txt +0 -0
  9. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info/licenses}/LICENSE +0 -0
  10. {db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/top_level.txt +0 -0
db_sync_tool/database/process.py CHANGED
@@ -51,9 +51,9 @@ def create_origin_database_dump():
51
51
  _mysqldump_options = _mysqldump_options + f'{_additional} '
52
52
 
53
53
  # Run mysql dump command, e.g.
54
- # MYSQL_PWD="db" mysqldump --no-tablespaces -u'db' -p'db' -h'db1' -P'3306' 'db' > /tmp/_db_08-10-2021_07-00.sql
54
+ # mysqldump --no-tablespaces -u'db' -p'db' -h'db1' -P'3306' 'db' > /tmp/_db_08-10-2021_07-00.sql
55
55
  mode.run_command(
56
- 'MYSQL_PWD="' + system.config[mode.Client.ORIGIN]['db']['password'] + '" ' + helper.get_command(mode.Client.ORIGIN, 'mysqldump') + ' ' + _mysqldump_options +
56
+ helper.get_command(mode.Client.ORIGIN, 'mysqldump') + ' ' + _mysqldump_options +
57
57
  database_utility.generate_mysql_credentials(mode.Client.ORIGIN) + ' \'' +
58
58
  system.config[mode.Client.ORIGIN]['db']['name'] + '\' ' +
59
59
  database_utility.generate_ignore_database_tables() +
@@ -149,7 +149,6 @@ def import_database_dump_file(client, filepath):
149
149
  """
150
150
  if helper.check_file_exists(client, filepath):
151
151
  mode.run_command(
152
- 'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' +
153
152
  helper.get_command(client, 'mysql') + ' ' +
154
153
  database_utility.generate_mysql_credentials(client) + ' \'' +
155
154
  system.config[client]['db']['name'] + '\' < ' + filepath,
@@ -208,13 +207,13 @@ def clear_database(client):
208
207
  :return:
209
208
  """
210
209
  mode.run_command(
211
- '{ MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' + helper.get_command(client, 'mysql') + ' ' +
210
+ '{ ' + helper.get_command(client, 'mysql') + ' ' +
212
211
  database_utility.generate_mysql_credentials(client) +
213
212
  ' -Nse \'show tables\' \'' +
214
213
  system.config[client]['db']['name'] + '\'; }' +
215
214
  ' | ( while read table; do if [ -z ${i+x} ]; then echo \'SET FOREIGN_KEY_CHECKS = 0;\'; fi; i=1; ' +
216
215
  'echo "drop table \\`$table\\`;"; done; echo \'SET FOREIGN_KEY_CHECKS = 1;\' ) | awk \'{print}\' ORS=' ' | ' +
217
- 'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' +
216
+ ' ' +
218
217
  helper.get_command(client, 'mysql') + ' ' +
219
218
  database_utility.generate_mysql_credentials(client) + ' ' +
220
219
  system.config[client]['db']['name'],
db_sync_tool/database/utility.py CHANGED
@@ -29,7 +29,7 @@ def run_database_command(client, command, force_database_name=False):
29
29
  _database_name = ' ' + system.config[client]['db']['name'] if force_database_name else ''
30
30
 
31
31
  return mode.run_command(
32
- 'MYSQL_PWD="' + system.config[client]['db']['password'] + '" ' + helper.get_command(client, 'mysql') + ' ' + generate_mysql_credentials(
32
+ helper.get_command(client, 'mysql') + ' ' + generate_mysql_credentials(
33
33
  client) + _database_name + ' -e "' + command + '"',
34
34
  client, True)
35
35
 
@@ -144,7 +144,7 @@ def get_database_tables():
144
144
  return _result
145
145
 
146
146
 
147
- def generate_mysql_credentials(client, force_password=False):
147
+ def generate_mysql_credentials(client, force_password=True):
148
148
  """
149
149
  Generate the needed database credential information for the mysql command
150
150
  :param client: String
db_sync_tool/info.py CHANGED
@@ -1,6 +1,6 @@
1
1
  """
2
2
  Info script
3
3
  """
4
- __version__ = "2.11.7"
4
+ __version__ = "2.11.9"
5
5
  __pypi_package_url__ = "https://pypi.org/pypi/db-sync-tool-kmi"
6
6
  __homepage__ = "https://github.com/jackd248/db-sync-tool"
db_sync_tool/recipes/typo3.py CHANGED
@@ -30,14 +30,16 @@ def check_configuration(client):
30
30
  _db_config = parse_database_credentials(json.loads(stdout)['DB'])
31
31
  elif '.env' in _path:
32
32
  # Try to parse settings from .env file
33
+ if 'db' not in system.config[client]:
34
+ system.config[client]['db'] = {}
35
+
33
36
  _db_config = {
34
- 'name': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__dbname', system.config[client]['path']),
35
- 'host': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__host', system.config[client]['path']),
36
- 'password': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__password', system.config[client]['path']),
37
- 'port': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__port', system.config[client]['path'])
38
- if get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__port',
39
- system.config[client]['path']) != '' else 3306,
40
- 'user': get_database_setting_from_env(client, 'TYPO3_CONF_VARS__DB__Connections__Default__user', system.config[client]['path']),
37
+ 'name': get_database_setting_from_env(client, system.config[client]['db'].get('name', 'TYPO3_CONF_VARS__DB__Connections__Default__dbname'), system.config[client]['path']),
38
+ 'host': get_database_setting_from_env(client, system.config[client]['db'].get('host', 'TYPO3_CONF_VARS__DB__Connections__Default__host'), system.config[client]['path']),
39
+ 'password': get_database_setting_from_env(client, system.config[client]['db'].get('password', 'TYPO3_CONF_VARS__DB__Connections__Default__password'), system.config[client]['path']),
40
+ 'port': get_database_setting_from_env(client, system.config[client]['db'].get('port', 'TYPO3_CONF_VARS__DB__Connections__Default__port'), system.config[client]['path'])
41
+ if get_database_setting_from_env(client, system.config[client]['db'].get('port', 'TYPO3_CONF_VARS__DB__Connections__Default__port'), system.config[client]['path']) != '' else 3306,
42
+ 'user': get_database_setting_from_env(client, system.config[client]['db'].get('user', 'TYPO3_CONF_VARS__DB__Connections__Default__user'), system.config[client]['path']),
41
43
  }
42
44
  elif 'AdditionalConfiguration.php' in _path:
43
45
  # Try to parse settings from AdditionalConfiguration.php file
{db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.1
2
- Name: db-sync-tool-kmi
3
- Version: 2.11.7
1
+ Metadata-Version: 2.4
2
+ Name: db_sync_tool-kmi
3
+ Version: 2.11.9
4
4
  Summary: Synchronize a database from and to host systems.
5
5
  Home-page: https://github.com/jackd248/db-sync-tool
6
6
  Author: Konrad Michalik
@@ -21,18 +21,31 @@ Classifier: Intended Audience :: Developers
21
21
  Requires-Python: >=3.5
22
22
  Description-Content-Type: text/markdown
23
23
  License-File: LICENSE
24
- Requires-Dist: paramiko >=2.11
25
- Requires-Dist: future-fstrings >=1.2
26
- Requires-Dist: pyyaml >=6.0
27
- Requires-Dist: jsonschema >=4.2.1
28
- Requires-Dist: requests >=2.26.0
29
- Requires-Dist: semantic-version >=2.8.5
30
- Requires-Dist: yaspin >=2.1
24
+ Requires-Dist: paramiko>=2.11
25
+ Requires-Dist: future-fstrings>=1.2
26
+ Requires-Dist: pyyaml>=6.0
27
+ Requires-Dist: jsonschema>=4.2.1
28
+ Requires-Dist: requests>=2.26.0
29
+ Requires-Dist: semantic_version>=2.8.5
30
+ Requires-Dist: yaspin>=2.1
31
+ Dynamic: author
32
+ Dynamic: author-email
33
+ Dynamic: classifier
34
+ Dynamic: description
35
+ Dynamic: description-content-type
36
+ Dynamic: home-page
37
+ Dynamic: license
38
+ Dynamic: license-file
39
+ Dynamic: requires-dist
40
+ Dynamic: requires-python
41
+ Dynamic: summary
31
42
 
32
43
  # db sync tool
33
44
 
34
45
  ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/db_sync_tool-kmi)
35
46
  ![PyPI](https://img.shields.io/pypi/v/db_sync_tool-kmi)
47
+ ![Pepy Total Downloads](https://img.shields.io/pepy/dt/db-sync-tool-kmi)
48
+ ![PyPI - Downloads](https://img.shields.io/pypi/dm/db-sync-tool-kmi)
36
49
  [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/?branch=master)
37
50
  [![Build Status](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jackd248/db-sync-tool/build-status/master)
38
51
 
{db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/RECORD RENAMED
@@ -1,15 +1,15 @@
1
1
  db_sync_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
2
2
  db_sync_tool/__main__.py,sha256=-pD13j2oYcKLhPprLy-LQeDCapj-FKrV3CDFHuYJu3g,11541
3
- db_sync_tool/info.py,sha256=hh8zjO1L4Fpu06f1t3M0x5DaYUYIuTqzWl7gMFNMFc0,165
3
+ db_sync_tool/info.py,sha256=lQSxNR2x67MTkUq0QcILVpQ7TTKZeUbjVY-U0Ws_skk,165
4
4
  db_sync_tool/sync.py,sha256=WMfMts0M8z3oecI-HL07xG9ktbba8D8h7_U-8tBwizY,2087
5
5
  db_sync_tool/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6
- db_sync_tool/database/process.py,sha256=zmaKkxMVLYG3kr7S9rUUuxE1fgsdKasRNOhxZgSfzvg,8357
7
- db_sync_tool/database/utility.py,sha256=EfxWwHUsS6hVIMD4Jrz3n2_HQNBn3pB2GWo6OpWph4k,7783
6
+ db_sync_tool/database/process.py,sha256=djOnNnwEswkmPbnJVsI3SvPSwzcZgAapighh3Ew5heE,8069
7
+ db_sync_tool/database/utility.py,sha256=MRvTfF0ZCdcDW1EfIwIJR4ZtemxTBasOf45q5hor6vs,7717
8
8
  db_sync_tool/recipes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
9
  db_sync_tool/recipes/drupal.py,sha256=jAo1d3vxZ4UZ4Vzk308Dsmn1--ORmVO2g87l8OpQoPw,1505
10
10
  db_sync_tool/recipes/laravel.py,sha256=kp_gnKG0iyX_rzM0GW7Ca9ZPV3oGfEgGsLvJR_0pVDo,1175
11
11
  db_sync_tool/recipes/symfony.py,sha256=8ObIRXdoBG1MbWD7pd1TxUQboz5LUWbfzz3TX6F9G5w,2517
12
- db_sync_tool/recipes/typo3.py,sha256=7IejOtxASfskymG5jBFKmEzjl2sON3miKo_78Oqvi2g,4761
12
+ db_sync_tool/recipes/typo3.py,sha256=6KLOgetCRe7cY60p0KqsP9Rq2DKRZVfnna4onritfy4,5067
13
13
  db_sync_tool/recipes/wordpress.py,sha256=KN3HTzDbs5p2GD7vvTEhBl7xNOiy2YHrXhVLmiF_y_A,1468
14
14
  db_sync_tool/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  db_sync_tool/remote/client.py,sha256=wjcoQ1jp9i8PMO_6XX2XMXZCoLXy-ySA38seZtY-Sns,6553
@@ -26,9 +26,9 @@ db_sync_tool/utility/output.py,sha256=uoiWE7Pm8qv1a3vrBupZHE545d1uZSQHiLAUgkHofL
26
26
  db_sync_tool/utility/parser.py,sha256=DIdWVGyiltyH8akoWyyXLvUmFPR-nvBrnzDctPJzgKw,6624
27
27
  db_sync_tool/utility/system.py,sha256=G74lWGFcJNmLr0l6-GkZWmkk7q3icv4MccuHFKP_Vsw,18539
28
28
  db_sync_tool/utility/validation.py,sha256=qZNPgkTwV_kJTNtFh0OXb2FHrsWPnDA2W_fftWs5hZc,3530
29
- db_sync_tool_kmi-2.11.7.dist-info/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
30
- db_sync_tool_kmi-2.11.7.dist-info/METADATA,sha256=URT5TX1lofJ0YOFnFfi8gLK-6i1HoAiBG-3fU2RrEKQ,12505
31
- db_sync_tool_kmi-2.11.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
32
- db_sync_tool_kmi-2.11.7.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
33
- db_sync_tool_kmi-2.11.7.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
34
- db_sync_tool_kmi-2.11.7.dist-info/RECORD,,
29
+ db_sync_tool_kmi-2.11.9.dist-info/licenses/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
30
+ db_sync_tool_kmi-2.11.9.dist-info/METADATA,sha256=CYfLbv50QzlHvm2Z81LWcGqux7iu4VtyCUpFaXL6D0M,12876
31
+ db_sync_tool_kmi-2.11.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
32
+ db_sync_tool_kmi-2.11.9.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
33
+ db_sync_tool_kmi-2.11.9.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
34
+ db_sync_tool_kmi-2.11.9.dist-info/RECORD,,
{db_sync_tool_kmi-2.11.7.dist-info → db_sync_tool_kmi-2.11.9.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: bdist_wheel (0.42.0)
2
+ Generator: setuptools (78.1.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5