Skip to content

Commit

Permalink
fix: jans-linux-setup test data load (#2685)
Browse files Browse the repository at this point in the history
* fix: jans-linux-setup qchar as class property

* fix: jans-linux-setup pgsql test data
  • Loading branch information
devrimyatar authored Oct 20, 2022
1 parent 3434e08 commit 4d4d848
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 4 additions & 1 deletion jans-linux-setup/jans_setup/setup_app/installers/rdbm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion jans-linux-setup/jans_setup/setup_app/utils/db_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4d4d848

Please sign in to comment.