select: Return null for non-exiting column indexes (#13196)

Fixes #13186
This commit is contained in:
Klaus Post 2021-09-13 09:13:25 -07:00 committed by GitHub
parent 311718309c
commit 5a64003f6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions

View File

@ -22,6 +22,8 @@ import (
"errors"
"fmt"
"io"
"strconv"
"strings"
"github.com/bcicen/jstream"
csv "github.com/minio/csvparser"
@ -43,6 +45,20 @@ type Record struct {
func (r *Record) Get(name string) (*sql.Value, error) {
index, found := r.nameIndexMap[name]
if !found {
// Check if index.
if strings.HasPrefix(name, "_") {
idx, err := strconv.Atoi(strings.TrimPrefix(name, "_"))
if err != nil {
return nil, fmt.Errorf("column %v not found", name)
}
// The position count starts at 1.
idx--
if idx >= len(r.csvRecord) || idx < 0 {
// If field index > number of columns, return null
return sql.FromNull(), nil
}
return sql.FromBytes([]byte(r.csvRecord[idx])), nil
}
return nil, fmt.Errorf("column %v not found", name)
}

View File

@ -675,6 +675,11 @@ func TestCSVQueries2(t *testing.T) {
query: `SELECT num2 from s3object s WHERE num2 = 0.765111`,
wantResult: `{"num2":" 0.765111"}`,
},
{
name: "select-non_exiting_values",
query: `SELECT _1 as first, s._100 from s3object s LIMIT 1`,
wantResult: `{"first":"1","_100":null}`,
},
}
defRequest := `<?xml version="1.0" encoding="UTF-8"?>