jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/testwithlogs (pull request #65)

Browse Source 
Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests
This commit is contained in:
Michael McGuinness
2025-02-14 10:56:24 +00:00
parent 477518e5eb
commit 0df3d16976
91 changed files with 1737 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/repository/result.sql.go
+16 -10
View File
@@ -53,17 +53,21 @@ WITH reqQueries as (
and $3 >= rq.addedVersion
and (rq.removedVersion is null or $3 < rq.removedVersion)
),
docs as (
SELECT id, jobId
FROM documents
WHERE id = $1
),
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 = $1
LIMIT 1
),
latestVersions AS (
@@ -80,13 +84,12 @@ latestVersions AS (
FROM reqQueries as rq
LEFT JOIN results as r ON rq.queryId = r.queryId
and r.documentId = $1
JOIN codeVersions as ccv on ccv.documentId = r.documentId
WHERE r.documentId = $1
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 = $1
@@ -118,17 +121,21 @@ type ListQueryRequirementValuesRow struct {
// and $3 >= rq.addedVersion
// and (rq.removedVersion is null or $3 < rq.removedVersion)
// ),
// docs as (
// SELECT id, jobId
// FROM documents
// WHERE id = $1
// ),
// 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 = $1
// LIMIT 1
// ),
// latestVersions AS (
@@ -145,13 +152,12 @@ type ListQueryRequirementValuesRow struct {
// FROM reqQueries as rq
// LEFT JOIN results as r ON rq.queryId = r.queryId
// and r.documentId = $1
// JOIN codeVersions as ccv on ccv.documentId = r.documentId
// WHERE r.documentId = $1
// 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 = $1