From 4d4d84860fbaa6c6d0cfe1572bb922ea283ed9f2 Mon Sep 17 00:00:00 2001 From: Devrim Date: Thu, 20 Oct 2022 19:14:25 +0300 Subject: [PATCH] fix: jans-linux-setup test data load (#2685) * fix: jans-linux-setup qchar as class property * fix: jans-linux-setup pgsql test data --- jans-linux-setup/jans_setup/setup_app/installers/rdbm.py | 5 ++++- jans-linux-setup/jans_setup/setup_app/utils/db_utils.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py b/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py index 68de5f99bf7..653d44f3948 100644 --- a/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py +++ b/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py @@ -28,8 +28,11 @@ def __init__(self): self.register_progess() self.output_dir = os.path.join(Config.output_dir, Config.rdbm_type) + @property + def qchar(self): + return '`' if Config.rdbm_type in ('mysql', 'spanner') else '"' + def install(self): - self.qchar = '`' if Config.rdbm_type in ('mysql', 'spanner') else '"' self.local_install() if Config.rdbm_install_type == InstallTypes.REMOTE and base.argsp.reset_rdbm_db: self.reset_rdbm_db() diff --git a/jans-linux-setup/jans_setup/setup_app/utils/db_utils.py b/jans-linux-setup/jans_setup/setup_app/utils/db_utils.py index b3e2460b304..ee819f01b2a 100644 --- a/jans-linux-setup/jans_setup/setup_app/utils/db_utils.py +++ b/jans-linux-setup/jans_setup/setup_app/utils/db_utils.py @@ -869,7 +869,6 @@ def import_ldif(self, ldif_files, bucket=None, force=None): if isinstance(sqlalchObj.__table__.columns[attribute].type, self.json_dialects_instance): cur_val = copy.deepcopy(getattr(sqlalchObj, attribute)) for val_ in new_val: - cur_val['v'].append(val_) if Config.rdbm_type == 'mysql': cur_val['v'].append(val_) else: