Browse Source

修改spec使用的类型

yjp 1 year ago
parent
commit
4996e89c36
3 changed files with 5 additions and 5 deletions
  1. 1 1
      client/data_container.go
  2. 1 1
      client/data_source.go
  3. 3 3
      client/sql.go

+ 1 - 1
client/data_container.go

@@ -12,7 +12,7 @@ const (
 	getDataContainersUrl   = "/ds/api/v1/dataContainer/query"
 )
 
-func (c *Client) CreateDataContainer(token string, baseUrl string, namespace string, dataSource string, name string, spec string) error {
+func (c *Client) CreateDataContainer(token string, baseUrl string, namespace string, dataSource string, name string, spec map[string]any) error {
 	fullUrl, err := url.JoinPath(baseUrl, createDataContainerUrl)
 	if err != nil {
 		return err

+ 1 - 1
client/data_source.go

@@ -12,7 +12,7 @@ const (
 	getDataSourcesUrl   = "/ds/api/v1/dataSource/query"
 )
 
-func (c *Client) CreateDataSource(token string, baseUrl string, namespace string, name string, typeStr string, spec string) error {
+func (c *Client) CreateDataSource(token string, baseUrl string, namespace string, name string, typeStr string, spec map[string]any) error {
 	fullUrl, err := url.JoinPath(baseUrl, createDataSourceUrl)
 	if err != nil {
 		return err

+ 3 - 3
client/sql.go

@@ -43,7 +43,7 @@ func (c *Client) ExecuteRawSql(token string, baseUrl string,
 	return resp.Results, nil
 }
 
-func (c *Client) ParseSqlSpec(token string, baseUrl string, specJson string, executeParams map[string]any) (string, error) {
+func (c *Client) ParseSqlSpec(token string, baseUrl string, spec map[string]any, executeParams map[string]any) (string, error) {
 	fullUrl, err := url.JoinPath(baseUrl, parseSqlSpecUrl)
 	if err != nil {
 		return "", err
@@ -55,7 +55,7 @@ func (c *Client) ParseSqlSpec(token string, baseUrl string, specJson string, exe
 	})
 
 	err = c.post(token, fullUrl, map[string]any{
-		"sql":           specJson,
+		"sql":           spec,
 		"executeParams": executeParams,
 	}, resp)
 	if err != nil {
@@ -69,7 +69,7 @@ func (c *Client) ParseSqlSpec(token string, baseUrl string, specJson string, exe
 	return resp.Parsed, nil
 }
 
-func (c *Client) CreateSql(token string, baseUrl string, namespace string, dataSource string, name string, spec string) error {
+func (c *Client) CreateSql(token string, baseUrl string, namespace string, dataSource string, name string, spec map[string]any) error {
 	fullUrl, err := url.JoinPath(baseUrl, createSqlUrl)
 	if err != nil {
 		return err