Merged the "accounting.database" module into the "accounting" module. It has only one member as "db", the database instance, and does not need to be separated into another file.

This commit is contained in:
2023-02-08 11:13:09 +08:00
parent e24ed61b99
commit d99f592cff
16 changed files with 22 additions and 67 deletions

View File

@ -21,9 +21,12 @@ import typing as t
from pathlib import Path
from flask import Flask, Blueprint
from flask_sqlalchemy import SQLAlchemy
from accounting.utils.user import AbstractUserUtils
db: SQLAlchemy = SQLAlchemy()
"""The database instance."""
data_dir: Path = Path(__file__).parent / "data"
"""The data directory."""
@ -45,8 +48,8 @@ def init_app(app: Flask, user_utils: AbstractUserUtils,
"""
# The database instance must be set before loading everything
# in the application.
from .database import set_db
set_db(app.extensions["sqlalchemy"])
global db
db = app.extensions["sqlalchemy"]
from .utils.user import init_user_utils
init_user_utils(user_utils)