chore: fix query api

flanksource · Apr 7, 2022 · 8876f25 · 8876f25
1 parent f1d9266
commit 8876f25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/db/migrations/5_jsonb_type.sql b/db/migrations/5_jsonb_type.sql
@@ -0,0 +1,10 @@
+-- +goose Up
+-- +goose StatementBegin
+---
+
+ALTER TABLE config_item  ALTER COLUMN config  SET DATA TYPE jsonb USING config::jsonb;
+ALTER TABLE config_scraper  ALTER COLUMN spec  SET DATA TYPE jsonb USING spec::jsonb;
+ALTER TABLE config_change  ALTER COLUMN patches  SET DATA TYPE jsonb USING patches::jsonb;
+ALTER TABLE config_analysis  ALTER COLUMN analysis  SET DATA TYPE jsonb USING analysis::jsonb;
+
+-- +goose StatementEnd
diff --git a/db/repository/db.go b/db/repository/db.go
@@ -60,7 +60,7 @@ func (d *DBRepo) CreateConfigChange(cc *models.ConfigChange) error {
 
 func (d *DBRepo) QueryConfigItems(request v1.QueryRequest) (*v1.QueryResult, error) {
 	results := d.db.Raw(request.Query)
-	logger.Debugf(request.Query)
+	logger.Tracef(request.Query)
 	if results.Error != nil {
 		return nil, fmt.Errorf("failed to parse query: %s -> %s", request.Query, results.Error)
 	}
@@ -77,19 +77,15 @@ func (d *DBRepo) QueryConfigItems(request v1.QueryRequest) (*v1.QueryResult, err
 		if err != nil {
 			logger.Errorf("failed to get column details: %v", err)
 		}
+		rows.Next()
 		if err := results.ScanRows(rows, &response.Results); err != nil {
-			return nil, fmt.Errorf("failed to run query: %s -> %s", request.Query, err)
+			return nil, fmt.Errorf("failed to scan rows: %s -> %s", request.Query, err)
 		}
 		for _, col := range columns {
 			response.Columns = append(response.Columns, v1.QueryColumn{
 				Name: col,
 			})
 		}
-
-		if len(response.Results) > 0 && isRowEmpty(response.Results[0]) {
-			//FIXME: why is an empty first row returned in the first place?
-			response.Results = response.Results[1:]
-		}
 	}
 	response.Count = len(response.Results)
 	return &response, nil