fix: response schema change for 0.9.0 (#37)

Author: everpcpc

query.go

@@ -20,25 +20,17 @@ func (e *QueryError) Error() string {
 }
 
 type DataField struct {
-	Name     string     `json:"name"`
-	DataType TypeDetail `json:"data_type"`
-}
-
-type TypeDetail struct {
+	Name string `json:"name"`
 	Type string `json:"type"`
 }
 
-type DataSchema struct {
-	Fields []DataField `json:"fields"`
-}
-
 type QueryResponse struct {
 	Data     [][]interface{} `json:"data"`
 	Error    *QueryError     `json:"error"`
 	FinalURI string          `json:"final_uri"`
 	Id       string          `json:"id"`
 	NextURI  string          `json:"next_uri"`
-	Schema   DataSchema      `json:"schema,omitempty"`
+	Schema   []DataField     `json:"schema"`
 	State    string          `json:"state"`
 	Stats    QueryStats      `json:"stats"`
 	StatsURI string          `json:"stats_uri"`

rows.go

@@ -2,7 +2,6 @@ package godatabend
 
 import (
 	"database/sql/driver"
-	"encoding/json"
 	"fmt"
 	"io"
 	"reflect"
@@ -46,18 +45,9 @@ func newNextRows(dc *DatabendConn, resp *QueryResponse) (*nextRows, error) {
 		return nil, err
 	}
 
-	for _, field := range result.Schema.Fields {
+	for _, field := range result.Schema {
 		columns = append(columns, field.Name)
-		x := &TypeDetail{}
-		res, err := json.Marshal(field.DataType)
-		if err != nil {
-			return nil, err
-		}
-		err = json.Unmarshal(res, &x)
-		if err != nil {
-			return nil, err
-		}
-		types = append(types, x.Type)
+		types = append(types, field.Type)
 	}
 
 	parsers := make([]DataParser, len(types))

rows_test.go

@@ -10,12 +10,10 @@ import (
 func TestTextRows(t *testing.T) {
 	rows, err := newNextRows(&DatabendConn{}, &QueryResponse{
 		Data: [][]interface{}{{1, 2, "3"}, {3, 2, "1"}},
-		Schema: DataSchema{
-			Fields: []DataField{
-				{Name: "age", DataType: TypeDetail{Type: "Int32"}},
-				{Name: "height", DataType: TypeDetail{Type: "Int64"}},
-				{Name: "score", DataType: TypeDetail{Type: "String"}},
-			},
+		Schema: []DataField{
+			{Name: "age", Type: "Int32"},
+			{Name: "height", Type: "Int64"},
+			{Name: "score", Type: "String"},
 		},
 		State: "Succeeded",
 	})

tests/main_test.go

@@ -94,8 +94,8 @@ func (s *DatabendTestSuite) TestDesc() {
 		{"s2", "VARCHAR", "NO", "", ""},
 		{"a16", "ARRAY(INT16)", "NO", "[]", ""},
 		{"a8", "ARRAY(UINT8)", "NO", "[]", ""},
-		{"d", "DATE", "NO", "0", ""},
-		{"t", "TIMESTAMP", "NO", "0", ""},
+		{"d", "DATE", "NO", "1970-01-01", ""},
+		{"t", "TIMESTAMP", "NO", "1970-01-01 00:00:00.000000", ""},
 	}, result)
 	rows.Close()
 }