apply security patch: v11.0.x/184-202409301526.patch
commit 52978144184ecdfea4fca8716c8aa194f42bf965 Author: Scott Lepper <scott.lepper@gmail.com> Date: Mon Sep 30 11:24:19 2024 -0400 remove sql expressions 11.0.x
This commit is contained in:
@@ -0,0 +1,26 @@
|
|||||||
|
package sql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DB struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (db *DB) TablesList(rawSQL string) ([]string, error) {
|
||||||
|
return nil, errors.New("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (db *DB) RunCommands(commands []string) (string, error) {
|
||||||
|
return "", errors.New("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (db *DB) QueryFramesInto(name string, query string, frames []*data.Frame, f *data.Frame) error {
|
||||||
|
return errors.New("not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewInMemoryDB() *DB {
|
||||||
|
return &DB{}
|
||||||
|
}
|
||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/jeremywohl/flatten"
|
"github.com/jeremywohl/flatten"
|
||||||
"github.com/scottlepp/go-duck/duck"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -18,7 +17,7 @@ const (
|
|||||||
|
|
||||||
// TablesList returns a list of tables for the sql statement
|
// TablesList returns a list of tables for the sql statement
|
||||||
func TablesList(rawSQL string) ([]string, error) {
|
func TablesList(rawSQL string) ([]string, error) {
|
||||||
duckDB := duck.NewInMemoryDB()
|
duckDB := NewInMemoryDB()
|
||||||
rawSQL = strings.Replace(rawSQL, "'", "''", -1)
|
rawSQL = strings.Replace(rawSQL, "'", "''", -1)
|
||||||
cmd := fmt.Sprintf("SELECT json_serialize_sql('%s')", rawSQL)
|
cmd := fmt.Sprintf("SELECT json_serialize_sql('%s')", rawSQL)
|
||||||
ret, err := duckDB.RunCommands([]string{cmd})
|
ret, err := duckDB.RunCommands([]string{cmd})
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||||
"github.com/scottlepp/go-duck/duck"
|
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/expr/mathexp"
|
"github.com/grafana/grafana/pkg/expr/mathexp"
|
||||||
"github.com/grafana/grafana/pkg/expr/sql"
|
"github.com/grafana/grafana/pkg/expr/sql"
|
||||||
@@ -85,7 +84,7 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V
|
|||||||
|
|
||||||
rsp := mathexp.Results{}
|
rsp := mathexp.Results{}
|
||||||
|
|
||||||
duckDB := duck.NewInMemoryDB()
|
duckDB := sql.NewInMemoryDB()
|
||||||
var frame = &data.Frame{}
|
var frame = &data.Frame{}
|
||||||
err := duckDB.QueryFramesInto(gr.refID, gr.query, allFrames, frame)
|
err := duckDB.QueryFramesInto(gr.refID, gr.query, allFrames, frame)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user