Fixing referential integrity

apache · Jun 3, 2015 · f27d20f · f27d20f
1 parent 161db60
commit f27d20f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/airflow/models.py b/airflow/models.py
@@ -1728,8 +1728,7 @@ class Chart(Base):
 
     id = Column(Integer, primary_key=True)
     label = Column(String(200))
-    conn_id = Column(
-        String(ID_LEN), ForeignKey('connection.conn_id'), nullable=False)
+    conn_id = Column(String(ID_LEN), nullable=False)
     user_id = Column(Integer(), ForeignKey('user.id'),)
     chart_type = Column(String(100), default="line")
     sql_layout = Column(String(50), default="series")
@@ -1742,7 +1741,9 @@ class Chart(Base):
     owner = relationship(
         "User", cascade=False, cascade_backrefs=False, backref='charts')
     x_is_date = Column(Boolean, default=True)
-    db = relationship("Connection")
+    db = relationship(
+        "Connection",
+        primaryjoin='Chart.conn_id == foreign(Connection.conn_id)')
     iteration_no = Column(Integer, default=0)
     last_modified = Column(DateTime, default=datetime.now())