Merged in feature/testwithlogs (pull request #65)

Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests

database/queries/result.sql

@@ -7,17 +7,21 @@ WITH reqQueries as (
         and @version >= rq.addedVersion
         and (rq.removedVersion is null or @version < rq.removedVersion)
 ),
+docs as (
+    SELECT id, jobId
+    FROM documents
+    WHERE id = @documentId
+),
 codeVersions as (
     SELECT 
         d.id as documentId,
         coalesce(ccv.minCleanVersion, 1) as minCleanVersion,
         coalesce(ccv.minTextVersion, 1) as minTextVersion
-    FROM documents as d
+    FROM docs as d
     LEFT JOIN collectors as c on c.jobId = d.jobId
     LEFT JOIN collectorCodeVersions as ccv on c.id = ccv.collectorId
         and c.activeVersion >= ccv.addedVersion
         and c.activeVersion < COALESCE(ccv.removedVersion, c.activeVersion)
-    WHERE d.id = @documentId
     LIMIT 1
 ),
 latestVersions AS (
@@ -34,13 +38,12 @@ latestVersions AS (
     FROM reqQueries as rq
     LEFT JOIN results as r ON rq.queryId = r.queryId
         and r.documentId = @documentId
-    JOIN codeVersions as ccv on ccv.documentId = r.documentId
-    WHERE r.documentId = @documentId
         and r.queryVersion = rq.activeVersion
+    JOIN codeVersions as ccv on ccv.documentId = r.documentId
         and r.cleanVersion >= ccv.minCleanVersion
         and r.textVersion >= ccv.minTextVersion
 )
-SELECT lv.queryId, lv.type, r.value
+SELECT DISTINCT lv.queryId, lv.type, r.value
 FROM latestVersions as lv
 JOIN results as r ON r.queryId = lv.queryId
     and r.documentId = @documentId