Skip to content

Commit

Permalink
Allow database eval to accept a writer (#288)
Browse files Browse the repository at this point in the history
* Allow database eval to accept a writer

* Fix for format
  • Loading branch information
eatonphil committed Aug 19, 2022
1 parent 1685b05 commit b3db5a8
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions runner/database.go
Expand Up @@ -395,13 +395,15 @@ func (ec EvalContext) loadJSONArrayPanel(projectId, panelId string) (chan map[st
return loadJSONArrayFile(f)
}

func (ec EvalContext) EvalDatabasePanel(
func (ec EvalContext) EvalDatabasePanelWithWriter(
project *ProjectState,
pageIndex int,
panel *PanelInfo,
panelResultLoader func(projectId, panelId string) (chan map[string]any, error),
cache CacheSettings,
w *ResultWriter,
) error {

var connector *ConnectorInfo
for _, c := range project.Connectors {
cc := c
Expand Down Expand Up @@ -438,12 +440,6 @@ func (ec EvalContext) EvalDatabasePanel(
return err
}

w, err := ec.GetResultWriter(project.Id, panel.Id)
if err != nil {
return err
}
defer w.Close()

if dbInfo.Address == "" {
dbInfo.Address = "localhost:" + defaultPorts[dbInfo.Type]
}
Expand Down Expand Up @@ -612,3 +608,19 @@ func (ec EvalContext) EvalDatabasePanel(
return err
})
}

func (ec EvalContext) EvalDatabasePanel(
project *ProjectState,
pageIndex int,
panel *PanelInfo,
panelResultLoader func(projectId, panelId string) (chan map[string]any, error),
cache CacheSettings,
) error {
w, err := ec.GetResultWriter(project.Id, panel.Id)
if err != nil {
return err
}
defer w.Close()

return ec.EvalDatabasePanelWithWriter(project, pageIndex, panel, panelResultLoader, cache, w)
}

0 comments on commit b3db5a8

Please sign in to comment.