Skip to content

Commit

Permalink
fix query sync next (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
hantmac authored Nov 6, 2022
1 parent 2d21588 commit 2b5b76e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
6 changes: 3 additions & 3 deletions interpolate.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ func interpolateParams(query string, params []driver.Value) (string, error) {
}

func interpolateParams2(query string, params []driver.Value, index []int) (string, error) {
if len(index) != len(params) {
return "", ErrPlaceholderCount
}
if len(params) == 0 {
return query, nil
}
if len(index) != len(params) {
return "", ErrPlaceholderCount
}

var (
queryRaw = []byte(query)
Expand Down
30 changes: 16 additions & 14 deletions rows.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,29 @@ func (r *nextRows) Next(dest []driver.Value) error {
if r.respData.State == "Succeeded" && len(r.respData.Data) == 0 {
return fmt.Errorf("end")
}
lineData := r.respData.Data[0]
r.respData.Data = r.respData.Data[1:]
r.dc.logger.Printf("the state is %s", r.respData.State)
if len(r.respData.Data) > 0 {
lineData := r.respData.Data[0]
r.respData.Data = r.respData.Data[1:]

for j := range lineData {
reader := strings.NewReader(fmt.Sprintf("%v", lineData[j]))
v, err := r.parsers[j].Parse(reader)
if err != nil {
return err
for j := range lineData {
reader := strings.NewReader(fmt.Sprintf("%v", lineData[j]))
v, err := r.parsers[j].Parse(reader)
if err != nil {
return err
}
dest[j] = v
}
if len(dest) != 0 {
return nil
}
dest[j] = v
}
if len(dest) != 0 {
return nil
}
if r.respData.State == "Succeeded" && len(r.respData.Data) == 0 {
return fmt.Errorf("end")
}

res, err := r.dc.rest.QueryPage(r.respData.Id, r.respData.NextURI)
if err != nil {
return err
}
r.dc.log(res.NextURI)

r.respData = *res
if res.Error != nil {
Expand Down

0 comments on commit 2b5b76e

Please sign in to comment.