jprdonnelly/steampipe
1
0
Fork 0
mirror of https://github.com/turbot/steampipe.git synced 2026-04-30 16:00:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of prepared statements - instead excute sql directly. Wrap with executions in LeafRuns to support runtime dependency resolution. Closes #2789. #2772

Browse Source
This commit is contained in:
kaidaguerre
2022-11-23 14:11:56 +00:00
committed by GitHub
parent 398334b8f0
commit fe6365b1ef
40 changed files with 398 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/query/queryexecute/execute.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/turbot/steampipe/pkg/error_helpers"
"github.com/turbot/steampipe/pkg/interactive"
"github.com/turbot/steampipe/pkg/query"
"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
"github.com/turbot/steampipe/pkg/utils"
)
@@ -65,11 +66,11 @@ func executeQueries(ctx context.Context, initData *query.InitData) int {
t := time.Now()
// build ordered list of queries
// (ordered for testing repeatability)
var queryNames []string = utils.SortedMapKeys(initData.Queries)
var queryNames = utils.SortedMapKeys(initData.Queries)
for i, name := range queryNames {
q := initData.Queries[name]
if err := executeQuery(ctx, q, initData.Client); err != nil {
if err := executeQuery(ctx, initData.Client, q); err != nil {
failures++
error_helpers.ShowWarning(fmt.Sprintf("executeQueries: query %d of %d failed: %v", i+1, len(queryNames), error_helpers.DecodePgError(err)))
// if timing flag is enabled, show the time taken for the query to fail
@@ -87,12 +88,12 @@ func executeQueries(ctx context.Context, initData *query.InitData) int {
return failures
}
func executeQuery(ctx context.Context, queryString string, client db_common.Client) error {
func executeQuery(ctx context.Context, client db_common.Client, resolvedQuery *modconfig.ResolvedQuery) error {
utils.LogTime("query.execute.executeQuery start")
defer utils.LogTime("query.execute.executeQuery end")
// the db executor sends result data over resultsStreamer
resultsStreamer, err := db_common.ExecuteQuery(ctx, queryString, client)
resultsStreamer, err := db_common.ExecuteQuery(ctx, client, resolvedQuery.ExecuteSQL, resolvedQuery.Args...)
if err != nil {
return err
}