diff --git a/cloudflare/d1/stmt.go b/cloudflare/d1/stmt.go index 6bf77ba..c1c92e1 100644 --- a/cloudflare/d1/stmt.go +++ b/cloudflare/d1/stmt.go @@ -59,7 +59,7 @@ func (s *stmt) QueryContext(_ context.Context, args []driver.NamedValue) (driver for i, arg := range args { argValues[i] = arg.Value } - resultPromise := s.stmtObj.Call("bind", argValues...).Call("raw", map[string]interface{}{"columnNames": true}) + resultPromise := s.stmtObj.Call("bind", argValues...).Call("raw", map[string]any{"columnNames": true}) rowsObj, err := jsutil.AwaitPromise(resultPromise) if err != nil { return nil, err @@ -70,19 +70,19 @@ func (s *stmt) QueryContext(_ context.Context, args []driver.NamedValue) (driver columns: nil, rowsObj: rowsObj, }, nil - } else { - // The first result array includes the column names. - colsArray := rowsObj.Index(0) - colsLen := colsArray.Length() - cols := make([]string, colsLen) - for i := 0; i < colsLen; i++ { - cols[i] = colsArray.Index(i).String() - } - // Remove the first result array from the rowsObj. - rowsObj.Call("shift") - return &rows{ - columns: cols, - rowsObj: rowsObj, - }, nil } + + // The first result array includes the column names. + colsArray := rowsObj.Index(0) + colsLen := colsArray.Length() + cols := make([]string, colsLen) + for i := 0; i < colsLen; i++ { + cols[i] = colsArray.Index(i).String() + } + // Remove the first result array from the rowsObj. + rowsObj.Call("shift") + return &rows{ + columns: cols, + rowsObj: rowsObj, + }, nil }