Add forked to indicator to query

rd_service/data/models.py

@@ -43,12 +43,13 @@ class Query(models.Model):
     ttl = models.IntegerField()
     user = models.CharField(max_length=360)
     created_at = models.DateTimeField(auto_now_add=True)
+    parent = models.ForeignKey('self', related_name='forks')
 
     class Meta:
         app_label = 'redash'
         db_table = 'queries'
 
-    def to_dict(self, with_result=True):
+    def to_dict(self, with_result=True, with_forks=True):
         d = {
             'id': self.id,
             'latest_query_data_id': self.latest_query_data_id,
@@ -59,11 +60,18 @@ def to_dict(self, with_result=True):
             'ttl': self.ttl,
             'user': self.user,
             'created_at': self.created_at,
+            'parent_id': self.parent_id
         }
 
         if with_result and self.latest_query_data_id:
             d['latest_query_data'] = self.latest_query_data.to_dict()
 
+        if self.parent_id:
+            d['parent_name'] = self.parent.name
+
+        if with_forks:
+            d['forks'] = [{'id': q.id, 'name': q.name} for q in self.forks.all()]
+
         return d
 
     def save(self, *args, **kwargs):

rd_service/data/tables.sql

@@ -17,7 +17,8 @@ CREATE TABLE "queries" (
     "query_hash" varchar(32) NOT NULL,
     "ttl" integer NOT NULL,
     "user" varchar(360) NOT NULL,
-    "created_at" timestamp with time zone NOT NULL
+    "created_at" timestamp with time zone NOT NULL,
+    "parent_id" integer REFERENCES "queries" ("id") DEFERRABLE INITIALLY DEFERRED
 )
 ;
 CREATE TABLE "dashboards" (
@@ -42,4 +43,4 @@ CREATE INDEX "queries_latest_query_data_id" ON "queries" ("latest_query_data_id"
 CREATE INDEX "widgets_query_id" ON "widgets" ("query_id");
 CREATE INDEX "widgets_dashboard_id" ON "widgets" ("dashboard_id");
 
-COMMIT;
+COMMIT;

rd_service/server.py

@@ -194,11 +194,15 @@ def post(self, id=None):
             query_def['created_at'] = dateutil.parser.parse(query_def['created_at'])
 
         query_def.pop('latest_query_data', None)
+        query_def.pop('forks', None)
+        query_def.pop('parent_name', None)
 
         if id:
             query = data.models.Query(**query_def)
             fields = query_def.keys()
+            # The following are only set on creation, make sure they don't change by mistake.            
             fields.remove('id')
+            fields.remove('parent_id')
             query.save(update_fields=fields)
         else:
             query_def['user'] = self.current_user

rd_ui/app/scripts/controllers.js

@@ -74,6 +74,7 @@
         $scope.duplicateQuery = function () {
             var oldId = $scope.query.id;
             $scope.query.id = null;
+            $scope.query.parent_id = oldId;
             $scope.query.ttl = -1;
 
             $scope.saveQuery(true, oldId);

rd_ui/app/views/queryfiddle.html

@@ -31,6 +31,17 @@ <h3 class="panel-title">
                 <span ng-show="queryResult.getStatus() == 'done'">Rows: {{queryResult.getData().length}} | </span>
                 Created by: {{query.user}}
                 <div class="pull-right">Refresh query: <select ng-model="query.ttl" ng-options="c.value as c.name for c in refreshOptions"></select><br></div>
+                <div ng-show="query.parent_id">
+                  Duplicated from: <a ng-href="/queries/{{query.parent_id}}">{{query.parent_name}}</a>
+                </div>
+
+                <div ng-show="query.forks.length">
+                  Duplicated to:
+                  <span ng-repeat="fork in query.forks">
+                    <a ng-href="/queries/{{fork.id}}">{{fork.name}}</a> |
+                  </span>
+                </div>
+
             </div>
         </div>
 
@@ -58,4 +69,4 @@ <h3 class="panel-title">
             <cohort-renderer query-result="queryResult"></cohort-renderer>
         </div>
     </div>
-</div>
+</div>