update csv format

Author: alexcheng1982

pom.xml

@@ -63,6 +63,21 @@
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       <version>2.5.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-csv</artifactId>
+      <version>1.12.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/com/javaaidev/text2sql/tool/RunSqlQueryTool.java

@@ -1,9 +1,12 @@
 package com.javaaidev.text2sql.tool;
 
+import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.simple.JdbcClient;
@@ -40,14 +43,19 @@ private String runQuery(String query) {
     if (CollectionUtils.isEmpty(rows)) {
       return "";
     }
-    var fields = rows.getFirst().keySet();
+    var fields = rows.getFirst().keySet().stream().sorted().toList();
+    var printer = CSVFormat.DEFAULT.builder()
+        .setHeader(fields.toArray(new String[0]))
+        .setSkipHeaderRecord(false)
+        .setRecordSeparator('\n')
+        .build();
     var builder = new StringBuilder();
-    builder.append(String.join(", ", fields));
     for (Map<String, Object> row : rows) {
-      var rowString = fields.stream().map(row::get)
-          .map(value -> Objects.toString(value, "") )
-          .collect(Collectors.joining(", "));
-      builder.append(rowString);
+      try {
+        printer.printRecord(builder, fields.stream().map(row::get).toArray());
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
     return builder.toString();
   }

src/test/java/com/javaaidev/text2sql/tool/RunSqlQueryToolTest.java

@@ -0,0 +1,31 @@
+package com.javaaidev.text2sql.tool;
+
+import java.util.List;
+import java.util.Map;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.when;
+import org.mockito.Mockito;
+import org.springframework.jdbc.core.simple.JdbcClient;
+import org.springframework.jdbc.core.simple.JdbcClient.ResultQuerySpec;
+import org.springframework.jdbc.core.simple.JdbcClient.StatementSpec;
+
+class RunSqlQueryToolTest {
+  @Test
+  void testCsvFormat() {
+    var mock = Mockito.mock(JdbcClient.class);
+    var resultQuerySpecMock = Mockito.mock(ResultQuerySpec.class);
+    when(resultQuerySpecMock.listOfRows()).thenReturn(List.of(
+        Map.of("v1", "Hello", "v2", 123),
+        Map.of("v1", "World","v2", 456)
+    ));
+    var statementSpecMock = Mockito.mock(StatementSpec.class);
+    when(statementSpecMock.query()).thenReturn(resultQuerySpecMock);
+    when(mock.sql(any())).thenReturn(statementSpecMock);
+    var tool = new RunSqlQueryTool(mock);
+    var response = tool.apply(new RunSqlQueryRequest("select 1"));
+    assertEquals("Hello,123\nWorld,456\n", response.result());
+  }
+}