Use lacre.dbschema definition of identities table
This commit is contained in:
parent
6ca5db2db3
commit
2edd842f90
2 changed files with 5 additions and 7 deletions
|
@ -1,6 +1,7 @@
|
||||||
"""Database-backed keyring implementation."""
|
"""Database-backed keyring implementation."""
|
||||||
|
|
||||||
from lacre._keyringcommon import KeyRing, KeyCache
|
from lacre._keyringcommon import KeyRing, KeyCache
|
||||||
|
from lacre.dbschema import init_identities_table
|
||||||
import logging
|
import logging
|
||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
from sqlalchemy.sql import select
|
from sqlalchemy.sql import select
|
||||||
|
@ -11,13 +12,7 @@ LOG = logging.getLogger(__name__)
|
||||||
class KeyRingSchema:
|
class KeyRingSchema:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._meta = sqlalchemy.MetaData()
|
self._meta = sqlalchemy.MetaData()
|
||||||
self._id_table = self._identities()
|
self._id_table = init_identities_table()
|
||||||
|
|
||||||
def _identities(self):
|
|
||||||
lacre_id = sqlalchemy.Table('gpgmw_identities', self._meta,
|
|
||||||
sqlalchemy.Column('email', sqlalchemy.String(256), index=True),
|
|
||||||
sqlalchemy.Column('key_id', sqlalchemy.String(64), index=True))
|
|
||||||
return lacre_id
|
|
||||||
|
|
||||||
def identities(self):
|
def identities(self):
|
||||||
return self._id_table
|
return self._id_table
|
||||||
|
|
|
@ -30,3 +30,6 @@ GPGMW_IDENTITIES = sqlalchemy.Table('gpgmw_identities', _meta,
|
||||||
sqlalchemy.Column('email', sqlalchemy.String(256), index=True),
|
sqlalchemy.Column('email', sqlalchemy.String(256), index=True),
|
||||||
# Key fingerprint
|
# Key fingerprint
|
||||||
sqlalchemy.Column('key_id', sqlalchemy.String(64), index=True))
|
sqlalchemy.Column('key_id', sqlalchemy.String(64), index=True))
|
||||||
|
|
||||||
|
def init_identities_table() -> sqlalchemy.Table:
|
||||||
|
return GPGMW_IDENTITIES
|
||||||
|
|
Loading…
Reference in a new issue