Merged in feature/jobcollector (pull request #30)

Initial Job Collector (changes pending)

* movearroundtocleancollector

* internalgetfunctions

* completecollectorquery

* simplify

* fixtests

* addvendor

* noplaceholder

database/queries/collector.sql

@@ -1,8 +1,14 @@
--- name: GetCollectorQueries :many
-SELECT collectorId, queryId, type, queryVersion, ARRAY_AGG(requiredQueryId) AS requiredIds
-    FROM collectorQueryDependencyTree
-    WHERE collectorId = $1
-    GROUP BY queryId, collectorId, type, queryVersion;
+-- name: ListCollectorQueries :many
+SELECT * FROM collectorQueryDependencyTree WHERE collectorId = $1;
 
--- name: GetCollectorFromJobID :one
-SELECT id, jobId, minCleanVersion, minTextVersion FROM collectors WHERE jobId = $1 LIMIT 1;
+-- name: GetCollectorByJobID :one
+SELECT * FROM fullActiveCollectors WHERE jobId = $1 LIMIT 1;
+
+-- name: GetCollector :one
+SELECT * FROM fullActiveCollectors WHERE id = $1 LIMIT 1;
+
+-- name: CreateCollector :one
+INSERT INTO collectors (jobId, minCleanVersion, minTextVersion) VALUES ($1, $2, $3) RETURNING id;
+
+-- name: AddCollectorQuery :exec
+INSERT INTO collectorQueries (collectorId, name, queryId, addedVersion) VALUES ($1, $2, $3, $4);

database/queries/query.sql

@@ -10,10 +10,10 @@ SELECT EXISTS (
 );
 
 -- name: GetQuery :one
-SELECT id, type, activeVersion, latestVersion, config, requiredIds FROM fullActiveQueries WHERE id = $1;
+SELECT * FROM fullActiveQueries WHERE id = $1;
 
 -- name: ListQueries :many
-SELECT id, type, activeVersion, latestVersion, config, requiredIds FROM fullActiveQueries;
+SELECT * FROM fullActiveQueries;
 
 -- name: CreateQuery :one
 INSERT INTO queries (type) VALUES ($1) RETURNING id;