Database memes

src/utils/__init__.py

@@ -1,3 +1,2 @@
-from .db import db
 from .healthchecks import health_database_status
 from .security import security, user_datastore

src/utils/config.py

@@ -19,10 +19,7 @@ SENTRY_DSN = os.environ.get("SENTRY_DSN")
 RELEASE_ID = os.environ.get("RELEASE_ID", "test")
 RELEASEMODE = os.environ.get("RELEASEMODE", "dev")
 
-POSTGRES_HOSTNAME = os.getenv("POSTGRES_HOSTNAME", "localhost")
-POSTGRES_USERNAME = os.getenv("POSTGRES_USERNAME", "webshop")
-POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "webshop")
-POSTGRES_DB = os.getenv("POSTGRES_DB", "webshop")
+SQLALCHEMY_URI = os.environ.get("SQLALCHEMY_URI", "sqlite://")
 
 SECRET_KEY = os.getenv("SECRET_KEY")
 ALLOWED_ORIGINS = os.environ.get('ALLOWED_ORIGINS', '*')

src/utils/db.py

@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-from flask_sqlalchemy import SQLAlchemy
-
-"""
-Databse object
-"""
-
-__author__ = '@tormakris'
-__copyright__ = "Copyright 2020, UnstableVortex Team"
-__module_name__ = "db"
-__version__text__ = "1"
-
-db = SQLAlchemy()

src/utils/healthchecks.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from .db import db
+from models.db import db
 
 """
 Healthchek functions

src/utils/security.py

@@ -11,8 +11,7 @@ __version__text__ = "1"
 
 from flask_security import Security, SQLAlchemyUserDatastore
 
-from models import User, Role
-from utils import db
+from models import db, User, Role
 
 user_datastore = SQLAlchemyUserDatastore(db, User, Role)
 security = Security()