Merge pull request #7 from nightbug-xx/codex/remove-base-from-config.py-or-update-models

Fix Base usage in models
This commit is contained in:
nightbug-xx 2025-06-09 18:10:19 +09:00 committed by GitHub
commit d3d1b71779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 7 deletions

View File

@ -1,7 +1,6 @@
# app/core/config.py # app/core/config.py
from pydantic_settings import BaseSettings from pydantic_settings import BaseSettings
from sqlalchemy.orm import declarative_base
class Settings(BaseSettings): class Settings(BaseSettings):
database_url: str database_url: str
@ -14,6 +13,4 @@ class Settings(BaseSettings):
settings = Settings() settings = Settings()
# 베이스 클래스
Base = declarative_base()

View File

@ -1,7 +1,7 @@
from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Boolean, func from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Boolean, func
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from datetime import datetime from datetime import datetime
from app.core.config import Base from app.core.database import Base
class Character(Base): class Character(Base):

View File

@ -2,7 +2,7 @@ from sqlalchemy import Column, Integer, String, Time, ForeignKey, DateTime, Bool
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from datetime import time, datetime from datetime import time, datetime
from app.core.config import Base from app.core.database import Base
class HomeworkType(Base): class HomeworkType(Base):
__tablename__ = "homework_types" __tablename__ = "homework_types"

View File

@ -1,7 +1,6 @@
# create_db.py # create_db.py
from app.core.config import Base from app.core.database import Base, engine
from app.core.database import engine
from app.models.user import User from app.models.user import User
from app.models.character import Character from app.models.character import Character
from app.models.homework import HomeworkType from app.models.homework import HomeworkType