From 5a64003f6f4ad96eee6282c5868d580f8303f88e Mon Sep 17 00:00:00 2001
From: Klaus Post <klauspost@gmail.com>
Date: Mon, 13 Sep 2021 09:13:25 -0700
Subject: [PATCH] select: Return null for non-exiting column indexes (#13196)

Fixes #13186
---
 internal/s3select/csv/record.go  | 16 ++++++++++++++++
 internal/s3select/select_test.go |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/internal/s3select/csv/record.go b/internal/s3select/csv/record.go
index f9c4e6269..15a0965b7 100644
--- a/internal/s3select/csv/record.go
+++ b/internal/s3select/csv/record.go
@@ -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)
 	}
 
diff --git a/internal/s3select/select_test.go b/internal/s3select/select_test.go
index 27bed4259..d383c169e 100644
--- a/internal/s3select/select_test.go
+++ b/internal/s3select/select_test.go
@@ -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"?>