formatting

This commit is contained in:
evilchili 2024-04-20 20:35:24 -07:00
parent 412efe2aec
commit a9593e83a2
7 changed files with 13 additions and 6 deletions

View File

@ -105,6 +105,7 @@ def setup(context: typer.Context):
@db_app.command()
def list(context: typer.Context):
from ttfrog.db.manager import db
print("\n".join(sorted(db.tables.keys())))
@ -114,6 +115,7 @@ def dump(context: typer.Context):
Dump tables (or the entire database) as a JSON blob.
"""
from ttfrog.db.manager import db
db.init()
print(db.dump(context.args))

View File

@ -23,6 +23,7 @@ class BaseObject(_BaseObject):
"""
Allows for iterating over Model objects' column names and values
"""
__abstract__ = True
def __iter__(self):

View File

@ -10,7 +10,6 @@ from pyramid_sqlalchemy import Session, init_sqlalchemy
from pyramid_sqlalchemy import metadata as _metadata
from sqlalchemy import create_engine
import ttfrog.db.schema
from ttfrog.path import database
@ -20,7 +19,7 @@ assert ttfrog.db.schema
class AlchemyEncoder(json.JSONEncoder):
def default(self, obj):
try:
return getattr(obj, '__json__')()
return getattr(obj, "__json__")()
except (AttributeError, NotImplementedError): # pragma: no cover
return super().default(obj)

View File

@ -1,4 +1,4 @@
from .character import *
from .classes import *
from .property import *
from .log import *
from .property import *

View File

@ -28,7 +28,7 @@ def attr_map_creator(fields):
class AncestryTraitMap(BaseObject):
__tablename__ = "trait_map"
__table_args__ = (UniqueConstraint("ancestry_id", "ancestry_trait_id"), )
__table_args__ = (UniqueConstraint("ancestry_id", "ancestry_trait_id"),)
id = Column(Integer, primary_key=True, autoincrement=True)
ancestry_id = Column(Integer, ForeignKey("ancestry.id"))
ancestry_trait_id = Column(Integer, ForeignKey("ancestry_trait.id"))
@ -67,7 +67,7 @@ class AncestryTrait(BaseObject):
class CharacterClassMap(BaseObject):
__tablename__ = "class_map"
__table_args__ = (UniqueConstraint("character_id", "character_class_id"), )
__table_args__ = (UniqueConstraint("character_id", "character_class_id"),)
id = Column(Integer, primary_key=True, autoincrement=True)
character_id = Column(Integer, ForeignKey("character.id"), nullable=False)
character_class_id = Column(Integer, ForeignKey("character_class.id"), nullable=False)
@ -82,7 +82,7 @@ class CharacterClassMap(BaseObject):
class CharacterClassAttributeMap(BaseObject):
__tablename__ = "character_class_attribute_map"
__table_args__ = (UniqueConstraint("character_id", "class_attribute_id"), )
__table_args__ = (UniqueConstraint("character_id", "class_attribute_id"),)
id = Column(Integer, primary_key=True, autoincrement=True)
character_id = Column(Integer, ForeignKey("character.id"), nullable=False)
class_attribute_id = Column(Integer, ForeignKey("class_attribute.id"), nullable=False)

View File

@ -32,14 +32,18 @@ def db(monkeypatch):
@pytest.fixture
def classes_factory(db):
load_fixture(db, "classes")
def factory():
return dict((rec.name, rec) for rec in db.session.query(schema.CharacterClass).all())
return factory
@pytest.fixture
def ancestries_factory(db):
load_fixture(db, "ancestry")
def factory():
return dict((rec.name, rec) for rec in db.session.query(schema.Ancestry).all())
return factory

View File

@ -1,4 +1,5 @@
import json
from ttfrog.db import schema