Philipp Hörist pushed to branch storage at gajim / gajim
Commits:
d370f814 by Philipp Hörist at 2024-03-04T23:25:17+01:00
refactor: Refactor some code
- - - - -
2 changed files:
- gajim/common/storage/archive/storage.py
- gajim/common/storage/events/storage.py
Changes:
=====================================
gajim/common/storage/archive/storage.py
=====================================
@@ -149,34 +149,34 @@ def _set_foreign_keys(self, session: Session, row: Any)
-> None:
else:
row.fk_real_remote_pk = self._get_jid_ek(session,
real_remote_jid)
- sec = hasattr(row, 'security_label_')
- if sec and row.security_label_ is not None:
+ security_label = getattr(row, 'security_label_', None)
+ if security_label is not None:
pk = self._upsert_row(session, row.security_label_)
row.security_label_ = None
row.fk_security_label_pk = pk
- enc = hasattr(row, 'encryption_')
- if enc and row.encryption_ is not None:
- pk = self._insert_row(session, row.encryption_,
return_pk_on_conflict=True)
+ encryption = getattr(row, 'encryption_', None)
+ if encryption is not None:
+ pk = self._insert_row(session, encryption,
return_pk_on_conflict=True)
row.encryption_ = None
row.fk_encryption_pk = pk
- has_thread_id = hasattr(row, 'thread_id_')
- if has_thread_id and row.thread_id_ is not None:
+ thread_id = getattr(row, 'thread_id_', None)
+ if thread_id is not None:
assert fk_account_pk is not None
assert fk_remote_pk is not None
thread = Thread(
fk_account_pk=fk_account_pk,
fk_remote_pk=fk_remote_pk,
- id=row.thread_id_,
+ id=thread_id,
)
pk = self._insert_row(session, thread, return_pk_on_conflict=True)
row.thread_ = None
row.fk_thread_pk = pk
- occupant = hasattr(row, 'occupant_')
- if occupant and row.occupant_ is not None:
- pk = self._upsert_row(session, row.occupant_)
+ occupant = getattr(row, 'occupant_', None)
+ if occupant is not None:
+ pk = self._upsert_row(session, occupant)
row.occupant_ = None
row.fk_occupant_pk = pk
=====================================
gajim/common/storage/events/storage.py
=====================================
@@ -61,7 +61,6 @@ def __init__(self):
def _create_table(self, session: Session, engine: Engine) -> None:
mod.Base.metadata.create_all(engine)
session.execute(sa.text(f'PRAGMA user_version=1'))
- session.commit()
def _migrate(self, session: Session) -> None:
pass
@@ -81,7 +80,6 @@ def store(self, session: Session, contact: ChatContactT,
event_: Any) -> None:
)
session.add(event)
- session.commit()
@with_session
def load(
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/d370f814f3c261358ccaacc95c229f8ded18d1fa
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/d370f814f3c261358ccaacc95c229f8ded18d1fa
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
