From a76fccbb75f398a4e043ab43dde6f1928e3343a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 1 Oct 2024 22:31:22 +0000 Subject: [PATCH] apply security patch: v11.0.x/184-202409301526.patch commit 52978144184ecdfea4fca8716c8aa194f42bf965 Author: Scott Lepper Date: Mon Sep 30 11:24:19 2024 -0400 remove sql expressions 11.0.x --- pkg/expr/sql/db.go | 26 ++++++++++++++++++++++++++ pkg/expr/sql/parser.go | 3 +-- pkg/expr/sql_command.go | 3 +-- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 pkg/expr/sql/db.go diff --git a/pkg/expr/sql/db.go b/pkg/expr/sql/db.go new file mode 100644 index 00000000000..1e7aca0c1b6 --- /dev/null +++ b/pkg/expr/sql/db.go @@ -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{} +} diff --git a/pkg/expr/sql/parser.go b/pkg/expr/sql/parser.go index 8b049cd57b7..4c28f668b79 100644 --- a/pkg/expr/sql/parser.go +++ b/pkg/expr/sql/parser.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/jeremywohl/flatten" - "github.com/scottlepp/go-duck/duck" ) const ( @@ -18,7 +17,7 @@ const ( // TablesList returns a list of tables for the sql statement func TablesList(rawSQL string) ([]string, error) { - duckDB := duck.NewInMemoryDB() + duckDB := NewInMemoryDB() rawSQL = strings.Replace(rawSQL, "'", "''", -1) cmd := fmt.Sprintf("SELECT json_serialize_sql('%s')", rawSQL) ret, err := duckDB.RunCommands([]string{cmd}) diff --git a/pkg/expr/sql_command.go b/pkg/expr/sql_command.go index bbcb942467f..7276b5ed841 100644 --- a/pkg/expr/sql_command.go +++ b/pkg/expr/sql_command.go @@ -7,7 +7,6 @@ import ( "time" "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/sql" @@ -85,7 +84,7 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V rsp := mathexp.Results{} - duckDB := duck.NewInMemoryDB() + duckDB := sql.NewInMemoryDB() var frame = &data.Frame{} err := duckDB.QueryFramesInto(gr.refID, gr.query, allFrames, frame) if err != nil {