MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

S3 Select: Mismatched types don't match (#8608)

Browse Source 
When comparing for equality, if types cannot be matched, they don't match.
This commit is contained in:
Klaus Post 2019-12-06 07:24:41 -08:00 committed by kannappanr
parent 97deba2a7c
commit f1e2e1cc9e
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/s3select/select_test.go
View File

@ -61,6 +61,7 @@ func TestJSONQueries(t *testing.T) {
query string
requestXML []byte // override request XML
wantResult string
withJSON string // Override JSON input
}{
{
name: "select-in-array-full",
@ -208,6 +209,26 @@ func TestJSONQueries(t *testing.T) {
query: `SELECT * from s3object s WHERE (8.0+0.5) IN s.nested[1][*]`,
wantResult: `{"id":3,"title":"Second Record","desc":"another text","nested":[[2,3,4],[7,8.5,9]]}`,
},
{
name: "compare-mixed",
query: `SELECT id from s3object s WHERE value = true`,
wantResult: `{"id":1}`,
withJSON: `{"id":0, "value": false}
{"id":1, "value": true}
{"id":2, "value": 42}
{"id":3, "value": "true"}
`,
},
{
name: "compare-mixed-not",
query: `SELECT COUNT(id) as n from s3object s WHERE value != true`,
wantResult: `{"n":3}`,
withJSON: `{"id":0, "value": false}
{"id":1, "value": true}
{"id":2, "value": 42}
{"id":3, "value": "true"}
`,
},
{
name: "select-output-field-as-csv",
requestXML: []byte(`<?xml version="1.0" encoding="UTF-8"?>
@ -263,7 +284,11 @@ func TestJSONQueries(t *testing.T) {
}
if err = s3Select.Open(func(offset, length int64) (io.ReadCloser, error) {
return ioutil.NopCloser(bytes.NewBufferString(input)), nil
in := input
if len(testCase.withJSON) > 0 {
in = testCase.withJSON
}
return ioutil.NopCloser(bytes.NewBufferString(in)), nil
}); err != nil {
t.Fatal(err)
}

9
pkg/s3select/sql/value.go
View File

@ -445,7 +445,14 @@ func (v *Value) compareOp(op string, a *Value) (res bool, err error) {
return timestampCompare(op, timestampV, timestampA), nil
}
return false, errCmpMismatchedTypes
// Types cannot be compared, they do not match.
switch op {
case opEq:
return false, nil
case opIneq:
return true, nil
}
return false, errCmpInvalidBoolOperator
}
func inferTypesForCmp(a *Value, b *Value) error {