fix: DatabaseUtils sql parse

arex-storage-config/pom.xml

@@ -41,7 +41,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.1.34</version>
+    <version>1.1.35</version>
   </parent>
 
   <properties>

arex-storage-model/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.1.34</version>
+    <version>1.1.35</version>
   </parent>
 
   <profiles>

arex-storage-web-api/pom.xml

@@ -123,7 +123,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.1.34</version>
+    <version>1.1.35</version>
   </parent>
 
   <profiles>

arex-storage-web-api/src/main/java/com/arextest/storage/utils/DatabaseUtils.java

@@ -29,7 +29,7 @@ public class DatabaseUtils {
     private DatabaseUtils() {
     }
 
-    private static final Pattern PATTERN = Pattern.compile("\\s+");
+    private static final Pattern PATTERN = Pattern.compile("(\\s+|\"\\?\")");
 
     public static void regenerateOperationName(Mocker mocker) {
         if (!MockCategoryType.DATABASE.getName().equals(mocker.getCategoryType().getName())) {
@@ -89,8 +89,8 @@ public static String parseDbName(String operationName, Mocker.Target targetReque
     }
 
     /**
-     * @param operationName example: dbName@tableName, tableName, tableName@action@operationName;
-     * @return tableNames
+     * @param operationName eg: db1@table1,table2@select@operation1;db2@table3,table4@select@operation2;
+     * @return tableNames eg: ["table1,table2", "table3,table4"]
      */
     public static List<String> parseTableNames(String operationName) {
         if (StringUtils.isEmpty(operationName)) {
@@ -104,8 +104,8 @@ public static List<String> parseTableNames(String operationName) {
         String[] operations = StringUtils.split(operationName, ';');
         List<String> tableList = new ArrayList<>(operations.length);
         for (String operation : operations) {
-            String[] subOperation = StringUtils.split(operation, '@');
-            if (subOperation.length < 1) {
+            String[] subOperation = StringUtils.splitPreserveAllTokens(operation, '@');
+            if (subOperation.length < 2 || StringUtils.isEmpty(subOperation[1])) {
                 continue;
             }
             tableList.add(subOperation[1]);

arex-storage-web-api/src/test/java/com/arextest/storage/utils/DatabaseUtilsTest.java

@@ -132,4 +132,34 @@ public void testSelectWithInnerJoin() {
         assertEquals("tk_project,tk_user_received_task_21", StringUtils.join(tableSchema.getTableNames(), ","));
         assertEquals(DbParseConstants.SELECT.toLowerCase(), tableSchema.getAction().toLowerCase());
     }
+
+    @Test
+    public void parseTableNames() {
+        // test operationName is Empty
+        List<String> tableNames = DatabaseUtils.parseTableNames("");
+        assertEquals(0, tableNames.size());
+
+        // test operationName contains one @
+        tableNames = DatabaseUtils.parseTableNames("db1@table1");
+        assertEquals(0, tableNames.size());
+
+        // test table name contain empty
+        tableNames = DatabaseUtils.parseTableNames("@@select@query");
+        assertEquals(0, tableNames.size());
+
+        tableNames = DatabaseUtils.parseTableNames("db1@table1,table2@select@operation1;db2@table3,table4@select@operation2");
+        assertEquals("table1,table2", tableNames.get(0));
+        assertEquals("table3,table4", tableNames.get(1));
+    }
+
+    @Test
+    public void parseSQLWithSubSelect() {
+        String sql = "select count(0) from ( select qi.code from qc_issue qi                 "
+            + "where qi.enable = 1                                       "
+            + "and (qi.title like \"%'?'%\" or qi.code like \"%\"?\"%\") "
+            + "and qi.product_code in             (                  ?             )      "
+            + "order by qi.id desc ) tmp_count";
+        TableSchema tableSchema = DatabaseUtils.parse(sql);
+        assertEquals("qc_issue", StringUtils.join(tableSchema.getTableNames(), ","));
+    }
 }

pom.xml

@@ -427,5 +427,5 @@
     <url>https://github.com/arextest/arex-storage</url>
   </scm>
   <url>https://github.com/arextest/arex-storage</url>
-  <version>1.1.34</version>
+  <version>1.1.35</version>
 </project>