diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman_pgp/database/__init__.py | 13 | ||||
| -rw-r--r-- | src/mailman_pgp/model/base.py | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/mailman_pgp/database/__init__.py b/src/mailman_pgp/database/__init__.py index b799942..5ea8f94 100644 --- a/src/mailman_pgp/database/__init__.py +++ b/src/mailman_pgp/database/__init__.py @@ -6,7 +6,7 @@ from mailman.config import config as mailman_config from mailman.utilities.string import expand from public import public from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker +from sqlalchemy.orm import scoped_session, sessionmaker from mailman_pgp.config import config from mailman_pgp.model.base import Base @@ -16,13 +16,16 @@ from mailman_pgp.model.base import Base class Database: def __init__(self): url = config.get('db', 'url') - self.url = expand(url, None, mailman_config.paths) - self.engine = create_engine(self.url) - Session = sessionmaker(bind=self.engine) - self.session = Session() + self._url = expand(url, None, mailman_config.paths) + self.engine = create_engine(self._url) + self._scoped_session = scoped_session(sessionmaker(bind=self.engine)) Base.metadata.create_all(self.engine) self.session.commit() + @property + def session(self): + return self._scoped_session() + @public @contextmanager diff --git a/src/mailman_pgp/model/base.py b/src/mailman_pgp/model/base.py index e25407f..12c0d42 100644 --- a/src/mailman_pgp/model/base.py +++ b/src/mailman_pgp/model/base.py @@ -6,3 +6,6 @@ from sqlalchemy.ext.declarative import declarative_base Base = declarative_base() public(Base=Base) + +from mailman_pgp.model.address import EncryptedAddress # noqa +from mailman_pgp.model.list import EncryptedMailingList # noqa |