2 files changed, 5 insertions, 2 deletions
diff --git a/cli/app/sql/models/graph.py b/cli/app/sql/models/graph.py
index 8e068a0..08f4d3c 100644
--- a/cli/app/sql/models/graph.py
+++ b/cli/app/sql/models/graph.py
@@ -23,6 +23,7 @@ class Graph(Base):
   updated_at = Column(UtcDateTime(), onupdate=utcnow())
 
   pages = relationship('Page', lazy='dynamic')
+  uploads = relationship('Upload', lazy='dynamic')
 
   def toJSON(self):
     return {
@@ -40,11 +41,13 @@ class Graph(Base):
   def toFullJSON(self):
     data = self.toJSON()
     data['pages'] = [ page.toLinkJSON() for page in self.pages ]
+    data['uploads'] = [ upload.toJSON() for upload in self.uploads ]
     return data
 
   def toSiteJSON(self):
     data = self.toJSON()
     data['pages'] = [ page.toFullJSON() for page in self.pages ]
+    data['uploads'] = [ upload.toJSON() for upload in self.uploads ]
     return data
 
 class GraphForm(ModelForm):
diff --git a/cli/app/sql/models/upload.py b/cli/app/sql/models/upload.py
index 87f758a..30e53dc 100644
--- a/cli/app/sql/models/upload.py
+++ b/cli/app/sql/models/upload.py
@@ -1,4 +1,4 @@
-from sqlalchemy import create_engine, Table, Column, String, Integer, DateTime
+from sqlalchemy import create_engine, Table, Column, ForeignKey, String, Integer, DateTime
 import sqlalchemy.sql.functions as func
 from sqlalchemy_utc import UtcDateTime, utcnow
 from wtforms_alchemy import ModelForm
@@ -14,7 +14,7 @@ class Upload(Base):
   """Table for storing references to various media"""
   __tablename__ = 'upload'
   id = Column(Integer, primary_key=True)
-  graph_id = Column(Integer)
+  graph_id = Column(Integer, ForeignKey('graph.id'), nullable=True)
   sha256 = Column(String(256), nullable=False)
   fn = Column(String(256), nullable=False)
   ext = Column(String(4, convert_unicode=True), nullable=False)