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

Merged in feature/defaultDBID (pull request #4)

Browse Source 
setdefaultidandreturn
This commit is contained in:
Michael McGuinness
2025-01-03 13:48:10 +00:00
parent 8590260185 9d3d0baa99
commit ccb1234911
9 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/migrations/20241202153119_create_queries_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE queries (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
latestVersion int not null default 1,
activeVersion int not null default 1,
type queryType not null
database/migrations/20241218183030_create_collectors_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE collectors (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
jobId uuid not null,
minCleanVersion int not null default 1,
minTextVersion int not null default 1,
database/migrations/20241218183541_create_collector_queries_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE collectorQueries (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
collectorId uuid not null,
name varchar(255) not null,
queryId uuid not null,
database/migrations/20241219130217_create_result_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE results (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
queryId uuid not null,
documentId uuid not null,
value TEXT not null,
database/migrations/20241219140508_create_required_query_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE requiredQueries (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
queryId uuid not null,
requiredQueryId uuid not null,
addedVersion int not null,
database/migrations/20241223113819_create_queryconfig_table.up.sql
+1 -1
View File
@@ -1,5 +1,5 @@
CREATE TABLE queryConfigs (
id uuid primary key,
id uuid primary key DEFAULT gen_random_uuid(),
queryId uuid not null,
config jsonb not null,
addedVersion int not null,
database/queries/result.sql
+2 -2
View File
@@ -4,5 +4,5 @@ SELECT id, queryId, queryVersion FROM results where documentId = $1 and cleanVer
-- name: ListResultValuesByID :many
SELECT id, queryId, value FROM results where id = ANY($1);
-- name: SetResult :exec
INSERT INTO results (id, queryId, documentId, value, cleanVersion, textVersion, queryVersion) VALUES ($1, $2, $3, $4, $5, $6, $7);
-- name: SetResult :one
INSERT INTO results (queryId, documentId, value, cleanVersion, textVersion, queryVersion) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id;
internal/database/repository/result.sql.go
+7 -7
View File
@@ -77,12 +77,11 @@ func (q *Queries) ListResultsByDocumentID(ctx context.Context, arg ListResultsBy
return items, nil
}
const setResult = `-- name: SetResult :exec
INSERT INTO results (id, queryId, documentId, value, cleanVersion, textVersion, queryVersion) VALUES ($1, $2, $3, $4, $5, $6, $7)
const setResult = `-- name: SetResult :one
INSERT INTO results (queryId, documentId, value, cleanVersion, textVersion, queryVersion) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id
`
type SetResultParams struct {
ID pgtype.UUID
Queryid pgtype.UUID
Documentid pgtype.UUID
Value string
@@ -91,9 +90,8 @@ type SetResultParams struct {
Queryversion int32
}
func (q *Queries) SetResult(ctx context.Context, arg SetResultParams) error {
_, err := q.db.Exec(ctx, setResult,
arg.ID,
func (q *Queries) SetResult(ctx context.Context, arg SetResultParams) (pgtype.UUID, error) {
row := q.db.QueryRow(ctx, setResult,
arg.Queryid,
arg.Documentid,
arg.Value,
@@ -101,5 +99,7 @@ func (q *Queries) SetResult(ctx context.Context, arg SetResultParams) error {
arg.Textversion,
arg.Queryversion,
)
return err
var id pgtype.UUID
err := row.Scan(&id)
return id, err
}
internal/result/service.go
+3 -4
View File
@@ -28,10 +28,7 @@ type ResultStore struct {
}
func Store(ctx context.Context, db *repository.Queries, res *ResultStore) (uuid.UUID, error) {
id := uuid.New()
err := db.SetResult(ctx, repository.SetResultParams{
ID: database.MustToDBUUID(id),
dbId, err := db.SetResult(ctx, repository.SetResultParams{
Queryid: database.MustToDBUUID(res.QueryID),
Documentid: database.MustToDBUUID(res.DocumentID),
Value: res.Value,
@@ -43,5 +40,7 @@ func Store(ctx context.Context, db *repository.Queries, res *ResultStore) (uuid.
return uuid.Nil, err
}
id := database.MustToUUID(dbId)
return id, nil
}