Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support sql lookup template sql #3398

Merged
merged 2 commits into from
Nov 26, 2024
Merged

feat: support sql lookup template sql #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4a17a5
support
Yisaer Nov 25, 2024
adc04c2
add test
Yisaer Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion extensions/impl/sql/lookupSource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,20 @@
return nil, err
}
}
query := s.gen.buildQuery(fields, keys, values)
var query string
if s.conf.TemplateSqlQueryCfg == nil {
query = s.gen.buildQuery(fields, keys, values)
} else {
mapValue := make(map[string]any)
for index, key := range keys {
mapValue[key] = values[index]
}
sqlQuery, err := ctx.ParseTemplate(s.conf.TemplateSqlQueryCfg.TemplateSql, mapValue)
if err != nil {
return nil, err
}

Check warning on line 123 in extensions/impl/sql/lookupSource.go

View check run for this annotation

Codecov / codecov/patch

extensions/impl/sql/lookupSource.go#L122-L123 

Added lines #L122 - L123 were not covered by tests
query = sqlQuery
}
ctx.GetLogger().Debugf("Query is %s", query)
rows, err := s.conn.GetDB().Query(query)
failpoint.Inject("dbErr", func() {
Expand Down
17 changes: 17 additions & 0 deletions extensions/impl/sql/lookupSource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,23 @@ func TestSQLLookupSource(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []map[string]any{{"a": int64(1), "b": int64(1)}}, got)
ls.Close(ctx)

props = map[string]interface{}{
"dburl": fmt.Sprintf("mysql://root:@%v:%v/test", address, port),
"datasource": "t",
"templateSqlQueryCfg": map[string]interface{}{
"templateSql": "select * from t where b = {{.bid}}",
},
}
ls = &SqlLookupSource{}
require.NoError(t, ls.Provision(ctx, props))
require.NoError(t, ls.Connect(ctx, func(status string, message string) {
// do nothing
}))
got, err = ls.Lookup(ctx, []string{"a", "b"}, []string{"bid"}, []any{1})
require.NoError(t, err)
require.Equal(t, []map[string]any{{"a": int64(1), "b": int64(1)}}, got)
ls.Close(ctx)
}

func TestSQLLookupSourceProvisionErr(t *testing.T) {
Expand Down
9 changes: 5 additions & 4 deletions extensions/impl/sql/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ func (s *SQLSourceConnector) Ping(ctx api.StreamContext, m map[string]any) error
}

type SQLConf struct {
Interval cast.DurationConf `json:"interval"`
DBUrl string `json:"dburl"`
URL string `json:"url,omitempty"`
Datasource string `json:"datasource"`
Interval cast.DurationConf `json:"interval"`
DBUrl string `json:"dburl"`
URL string `json:"url,omitempty"`
Datasource string `json:"datasource"`
TemplateSqlQueryCfg *sqlgen.TemplateSqlQueryCfg `json:"templateSqlQueryCfg"`
}

func init() {
Expand Down
Loading