More flushes

mistercrunch · May 10, 2016 · 99deb49 · 99deb49
1 parent 2ec0d49
commit 99deb49
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/caravel/models.py b/caravel/models.py
@@ -1007,8 +1007,8 @@ def sync_to_db(cls, name, cluster):
             flasher("Adding new datasource [{}]".format(name), "success")
         else:
             flasher("Refreshing datasource [{}]".format(name), "info")
-        datasource.cluster = cluster
         session.flush()
+        datasource.cluster = cluster
 
         cols = datasource.latest_metadata()
         if not cols:
@@ -1029,8 +1029,10 @@ def sync_to_db(cls, name, cluster):
                 col_obj.filterable = True
             if col_obj:
                 col_obj.type = cols[col]['type']
+            session.flush()
             col_obj.datasource = datasource
             col_obj.generate_metrics()
+            session.flush()
 
     def query(  # druid
             self, groupby, metrics,
@@ -1383,7 +1385,7 @@ def generate_metrics(self):
             metric.datasource_name = self.datasource_name
             if not m:
                 session.add(metric)
-                session.commit()
+                session.flush()
 
 
 class FavStar(Model):