Skip to content
Snippets Groups Projects

merge feature/COMP-152-EC-PROJECTS-TABLE into develop

Merged Bjarke Madsen requested to merge feature/COMP-152-EC-PROJECTS-TABLE into develop
2 unresolved threads
Files
16
+ 8
0
@@ -99,3 +99,11 @@ class SubOrganization(base_schema):
@@ -99,3 +99,11 @@ class SubOrganization(base_schema):
year = sa.Column(sa.Integer, primary_key=True)
year = sa.Column(sa.Integer, primary_key=True)
organization = sa.Column(sa.String(128), primary_key=True)
organization = sa.Column(sa.String(128), primary_key=True)
role = sa.Column(sa.String(128), nullable=False)
role = sa.Column(sa.String(128), nullable=False)
 
 
 
class ECProject(base_schema):
 
__tablename__ = 'ec_project'
 
nren_id = sa.Column(sa.Integer, sa.schema.ForeignKey(NREN.id), primary_key=True)
 
nren = relationship(NREN, lazy='joined')
 
year = sa.Column(sa.Integer, primary_key=True)
 
project = sa.Column(sa.String(256), primary_key=True)
Loading