[Array] Fix ordinal boundary indexing (#155)

goccy · Mar 9, 2024 · 4505d46 · 4505d46
1 parent 4a17cdc
commit 4505d46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/internal/function.go b/internal/function.go
@@ -188,7 +188,7 @@ func ARRAY_ORDINAL(v Value, idx int) (Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	if idx < 1 || len(array.values) <= idx {
+	if idx < 1 || len(array.values) < idx {
 		return nil, fmt.Errorf("ORDINAL(%d) is out of range", idx)
 	}
 	return array.values[idx-1], nil
@@ -199,7 +199,7 @@ func ARRAY_SAFE_ORDINAL(v Value, idx int) (Value, error) {
 	if err != nil {
 		return nil, err
 	}
-	if idx < 1 || len(array.values) <= idx {
+	if idx < 1 || len(array.values) < idx {
 		return nil, nil
 	}
 	return array.values[idx-1], nil

diff --git a/query_test.go b/query_test.go
@@ -531,6 +531,12 @@ FROM Items`,
 				nil,
 			}},
 		},
+		{
+			name: "array boundary indexing test",
+			query: `WITH toks AS (SELECT ['one', 'two'] AS digits)
+					SELECT digits[SAFE_ORDINAL(2)], digits[ORDINAL(2)], digits[OFFSET(1)], digits[SAFE_OFFSET(1)] FROM toks`,
+			expectedRows: [][]interface{}{{"two", "two", "two", "two"}},
+		},
 		{
 			name: "create function",
 			query: `