basestructure

internal/database/repository/query.sql.go

@@ -62,10 +62,10 @@ func (q *Queries) DeprecateQuery(ctx context.Context, queryid pgtype.UUID) error
 }
 
 const getQuery = `-- name: GetQuery :one
-SELECT q.id, q.type, q.activeVersion, q.latestVersion, c.config, ARRAY_AGG(r.requiredQueryId) AS requiredIds
+SELECT q.id, q.type, q.activeVersion, q.latestVersion, c.config, ARRAY_AGG(DISTINCT r.requiredQueryId) as requiredIds
     FROM queries AS q
-    JOIN queryConfigs AS c ON q.id = c.queryId
-    JOIN requiredQueries AS r ON q.id = r.queryId
+    LEFT JOIN queryConfigs AS c ON q.id = c.queryId
+    LEFT JOIN requiredQueries AS r ON q.id = r.queryId
     WHERE q.id = $1
     and c.addedVersion >= q.activeVersion
     and COALESCE(c.removedVersion, q.activeVersion - 1) < q.activeVersion
@@ -134,8 +134,8 @@ func (q *Queries) IsQueryDeprecated(ctx context.Context, queryid pgtype.UUID) (b
 const listQueries = `-- name: ListQueries :many
 SELECT q.id, q.type, q.activeVersion, q.latestVersion, c.config, ARRAY_AGG(r.requiredQueryId) AS requiredIds
     FROM queries AS q
-    JOIN queryConfigs AS c ON q.id = c.queryId
-    JOIN requiredQueries AS r ON q.id = r.queryId
+    LEFT JOIN queryConfigs AS c ON q.id = c.queryId
+    LEFT JOIN requiredQueries AS r ON q.id = r.queryId
     WHERE c.addedVersion >= q.activeVersion
     and COALESCE(c.removedVersion, q.activeVersion - 1) < q.activeVersion
     and r.addedVersion >= q.activeVersion

internal/query/create.go

@@ -42,7 +42,7 @@ func (s *Service) submitCreate(ctx context.Context, entity *queryprocessor.Creat
 	if err != nil {
 		return uuid.Nil, err
 	}
-	defer tx.Rollback(ctx)
+	// defer tx.Rollback(ctx)
 
 	qtx := s.db.Queries.WithTx(tx)
 
@@ -73,6 +73,11 @@ func (s *Service) submitCreate(ctx context.Context, entity *queryprocessor.Creat
 		}
 	}
 
+	err = tx.Commit(ctx)
+	if err != nil {
+		return uuid.Nil, err
+	}
+
 	id := database.MustToUUID(dbID)
 
 	return id, nil