cleanup and slight refactor

This commit is contained in:
2024-06-13 17:45:12 +00:00
parent 66193dc27f
commit c5e5dca000
5 changed files with 105 additions and 86 deletions

25
db.py
View File

@@ -1,15 +1,8 @@
from sqlalchemy import create_engine, Table, Column, MetaData, Integer, String, Boolean, DateTime, ForeignKey
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker, relationship, mapped_column
import os
from sqlalchemy import create_engine, Column, Integer, String, DateTime, Boolean
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
# Set up SQLite database
if os.getenv("SQLITE_FILE") is not None:
sqlite_file = os.getenv("SQLITE_FILE")
else:
raise Exception("SQLite File not defined!")
DATABASE_URI = f'sqlite:///{sqlite_file}'
engine = create_engine(DATABASE_URI)
Base = declarative_base()
class DBGroupInstance(Base):
@@ -19,10 +12,14 @@ class DBGroupInstance(Base):
instance_id = Column(String, nullable=False)
world_name = Column(String, nullable=False)
member_count = Column(Integer, nullable=False)
# Create tables if they don't exist
Base.metadata.create_all(engine)
delivered = Column(Boolean, nullable=False)
def get_session():
sqlite_file = os.getenv("SQLITE_FILE")
if not sqlite_file:
raise Exception("SQLite File not defined!")
database_uri = f'sqlite:///{sqlite_file}'
engine = create_engine(database_uri)
Base.metadata.create_all(engine)
Session = sessionmaker(bind=engine)
return Session()
return Session()