Update master branch

api/__init__.py

@@ -88,6 +88,7 @@ def create_app():
     annotations_lookup_db.init_app(bar_app)
     eplant2_db.init_app(bar_app)
     eplant_poplar_db.init_app(bar_app)
+    eplant_rice_db.init_app(bar_app)
     eplant_tomato_db.init_app(bar_app)
     poplar_nssnp_db.init_app(bar_app)
     tomato_nssnp_db.init_app(bar_app)
@@ -147,6 +148,7 @@ def create_app():
 annotations_lookup_db = SQLAlchemy(metadata=MetaData())
 eplant2_db = SQLAlchemy(metadata=MetaData())
 eplant_poplar_db = SQLAlchemy(metadata=MetaData())
+eplant_rice_db = SQLAlchemy(metadata=MetaData())
 eplant_tomato_db = SQLAlchemy(metadata=MetaData())
 poplar_nssnp_db = SQLAlchemy(metadata=MetaData())
 tomato_nssnp_db = SQLAlchemy(metadata=MetaData())

api/models/eplant_rice.py

@@ -0,0 +1,9 @@
+from api import eplant_rice_db as db
+
+
+class GeneAnnotation(db.Model):
+    __bind_key__ = "eplant_rice"
+    __tablename__ = "gene_annotation"
+
+    gene = db.Column(db.String(20), nullable=False, primary_key=True)
+    annotation = db.Column(db.String(64000), nullable=False, primary_key=False)

api/models/summarization.py

@@ -4,9 +4,11 @@
 class SummarizationGeneExpression(db.Model):
     __bind_key__ = "summarization"
     __tablename__ = "summarization"
-    Gene = db.Column(db.String(24), primary_key=True)
-    Value = db.Column(db.Integer, primary_key=True)
-    Sample = db.Column(db.String(32), primary_key=True)
+    proj_id = db.Column(db.String(5), nullable=False)
+    sample_id = db.Column(db.Integer, nullable=False, server_default=db.FetchedValue())
+    data_probeset_id = db.Column(db.String(24), primary_key=True)
+    data_signal = db.Column(db.Integer, primary_key=True)
+    data_bot_id = db.Column(db.String(32), primary_key=True)
 
 
 class Requests(db.Model):