Set DatasourceName and DatasourceType in proxy.Options (#80923)
* Set DatasourceName and DatasourceType in proxy.Options * upgrade github.com/grafana/grafana-plugin-sdk-go to v0.206.0 and fix merge conflicts
This commit is contained in:
@@ -212,7 +212,7 @@ func TestIntegrationPostgres(t *testing.T) {
|
||||
|
||||
cnnstr := postgresTestDBConnString()
|
||||
|
||||
db, exe, err := newPostgres(cfg, dsInfo, cnnstr, logger)
|
||||
db, exe, err := newPostgres(cfg, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
|
||||
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -1268,7 +1268,7 @@ func TestIntegrationPostgres(t *testing.T) {
|
||||
dsInfo := sqleng.DataSourceInfo{}
|
||||
conf := setting.NewCfg()
|
||||
conf.DataProxyRowLimit = 1
|
||||
_, handler, err := newPostgres(conf, dsInfo, cnnstr, logger)
|
||||
_, handler, err := newPostgres(conf, dsInfo, cnnstr, logger, backend.DataSourceInstanceSettings{})
|
||||
|
||||
require.NoError(t, err)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user