From 2a5302da29d34e2abe74ca7ab060c1e53b21ee54 Mon Sep 17 00:00:00 2001
From: Andrei Stefan <andrei@elastic.co>
Date: Fri, 12 Jan 2024 17:26:19 +0200
Subject: [PATCH] Fix

---
 .../xpack/esql/CsvTestUtils.java              | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
index 134d2cd66db9b..919f6b74753ab 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
@@ -349,16 +349,20 @@ public static ExpectedResults loadCsvSpecValues(String csv) {
                     if (value.startsWith("[") ^ value.endsWith("]")) {
                         throw new IllegalArgumentException("Incomplete multi-value (opening and closing square brackets) found " + value);
                     }
-                    // split on comma ignoring escaped commas, ignoring any potential starting and stopping square brackets
-                    String[] multiValues = value.substring(1, value.length() - 1).split(COMMA_ESCAPING_REGEX);
-                    if (multiValues.length > 0 && value.startsWith("[")) {// commas outside a multi-value should be ok
-                        List<Object> listOfMvValues = new ArrayList<>();
-                        for (String mvValue : multiValues) {
-                            listOfMvValues.add(columnTypes.get(i).convert(mvValue.trim().replace(ESCAPED_COMMA_SEQUENCE, ",")));
+                    if (value.contains(",") && value.startsWith("[")) {
+                        // split on comma ignoring escaped commas, ignoring any potential starting and stopping square brackets
+                        String[] multiValues = value.substring(1, value.length() - 1).split(COMMA_ESCAPING_REGEX);
+                        if (multiValues.length > 0) {
+                            List<Object> listOfMvValues = new ArrayList<>();
+                            for (String mvValue : multiValues) {
+                                listOfMvValues.add(columnTypes.get(i).convert(mvValue.trim().replace(ESCAPED_COMMA_SEQUENCE, ",")));
+                            }
+                            rowValues.add(listOfMvValues);
+                        } else {
+                            rowValues.add(columnTypes.get(i).convert(value.replace(ESCAPED_COMMA_SEQUENCE, ",")));
                         }
-                        rowValues.add(listOfMvValues);
                     } else {
-                        rowValues.add(columnTypes.get(i).convert(value.replace(ESCAPED_COMMA_SEQUENCE, ",")));
+                        rowValues.add(columnTypes.get(i).convert(value));
                     }
                 }
                 values.add(rowValues);