From 9f855af9c300929c1aadb59ab57e19116632cccd Mon Sep 17 00:00:00 2001 From: lawrancejing Date: Wed, 25 Nov 2015 15:05:06 +0000 Subject: [PATCH] Refactor evoque models Change-Id: Ie4d9c113a90d78a9c76aa9f91a6849cbeb7acb05 --- evoque/db/sqlalchemy/models.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/evoque/db/sqlalchemy/models.py b/evoque/db/sqlalchemy/models.py index 5819709..da67c90 100644 --- a/evoque/db/sqlalchemy/models.py +++ b/evoque/db/sqlalchemy/models.py @@ -33,6 +33,13 @@ class EvoqueBase(models.TimestampMixin, metadata = sqlalchemy.Column(types.Dict) + user = sqlalchemy.Column(sqlalchemy.String(32)) + project = sqlalchemy.Column(sqlalchemy.String(32)) + domain = sqlalchemy.Column(sqlalchemy.String(32)) + user_id = sqlalchemy.Column(sqlalchemy.String(255)) + project_id = sqlalchemy.Column(sqlalchemy.String(255)) + domain_id = sqlalchemy.Column(sqlalchemy.String(255)) + class Ticket(BASE, EvoqueBase): """Represents a ticket created by the Evoque engine.""" @@ -45,13 +52,6 @@ class Ticket(BASE, EvoqueBase): type = sqlalchemy.Column(sqlalchemy.String(255)) status = sqlalchemy.Column(sqlalchemy.String(255)) - user = sqlalchemy.Column(sqlalchemy.String(32)) - project = sqlalchemy.Column(sqlalchemy.String(32)) - domain = sqlalchemy.Column(sqlalchemy.String(32)) - user_id = sqlalchemy.Column(sqlalchemy.String(255)) - project_id = sqlalchemy.Column(sqlalchemy.String(255)) - domain_id = sqlalchemy.Column(sqlalchemy.String(255)) - class Workflow(BASE, EvoqueBase): """Represents a workflow created by the Evoque engine.""" @@ -62,10 +62,3 @@ class Workflow(BASE, EvoqueBase): default=lambda: str(uuid.uuid4())) name = sqlalchemy.Column('name', sqlalchemy.String(255)) spec = sqlalchemy.Column('spec', types.MediumText()) - - user = sqlalchemy.Column(sqlalchemy.String(32)) - project = sqlalchemy.Column(sqlalchemy.String(32)) - domain = sqlalchemy.Column(sqlalchemy.String(32)) - user_id = sqlalchemy.Column(sqlalchemy.String(255)) - project_id = sqlalchemy.Column(sqlalchemy.String(255)) - domain_id = sqlalchemy.Column(sqlalchemy.String(255))