diff options
Diffstat (limited to 'animism-align/cli/app/sql/models')
| -rw-r--r-- | animism-align/cli/app/sql/models/annotation.py | 2 | ||||
| -rw-r--r-- | animism-align/cli/app/sql/models/paragraph.py | 2 | ||||
| -rw-r--r-- | animism-align/cli/app/sql/models/user.py | 33 |
3 files changed, 35 insertions, 2 deletions
diff --git a/animism-align/cli/app/sql/models/annotation.py b/animism-align/cli/app/sql/models/annotation.py index 2b42eac..a22c941 100644 --- a/animism-align/cli/app/sql/models/annotation.py +++ b/animism-align/cli/app/sql/models/annotation.py @@ -10,7 +10,7 @@ from app.sql.common import db, Base, Session from app.settings import app_cfg class Annotation(Base): - """Table for storing references to graphs""" + """Table for storing references to annotations""" __tablename__ = 'annotation' id = Column(Integer, primary_key=True) type = Column(String(16, convert_unicode=True), nullable=False) diff --git a/animism-align/cli/app/sql/models/paragraph.py b/animism-align/cli/app/sql/models/paragraph.py index 790c9f0..5623db0 100644 --- a/animism-align/cli/app/sql/models/paragraph.py +++ b/animism-align/cli/app/sql/models/paragraph.py @@ -10,7 +10,7 @@ from app.sql.common import db, Base, Session from app.settings import app_cfg class Paragraph(Base): - """Table for storing references to graphs""" + """Table for storing paragraphs, which contain annotations""" __tablename__ = 'paragraph' id = Column(Integer, primary_key=True) type = Column(String(16, convert_unicode=True), nullable=False) diff --git a/animism-align/cli/app/sql/models/user.py b/animism-align/cli/app/sql/models/user.py new file mode 100644 index 0000000..bbc6eef --- /dev/null +++ b/animism-align/cli/app/sql/models/user.py @@ -0,0 +1,33 @@ +from sqlalchemy import create_engine, Table, Column, Text, String, Integer, Boolean, Float, DateTime, JSON, ForeignKey +from sqlalchemy.orm import relationship +import sqlalchemy.sql.functions as func +from sqlalchemy_utc import UtcDateTime, utcnow +from wtforms_alchemy import ModelForm + +from app.sql.common import db, Base, Session + +from app.settings import app_cfg + +class User(Base): + """Table for storing the user list""" + __tablename__ = 'user' + id = Column(Integer, primary_key=True) + username = Column(String(256, convert_unicode=True), nullable=False) + password = Column(String(256, convert_unicode=True), nullable=False) + is_admin = Column(Boolean, default=False) + settings = Column(JSON, default={}, nullable=True) + + def toJSON(self): + return { + 'id': self.id, + 'username': self.username, + 'is_admin': self.is_admin, + 'settings': self.settings, + } + +class UserForm(ModelForm): + class Meta: + model = User + exclude = ['settings'] + def get_session(): + return Session() |
