fix: double slop (DataLinkDC#3063)

Signed-off-by: Lichao <lecho.sun@gmail.com> Co-authored-by: leechor <leechor@users.noreply.github.com>
hugh018 · Jan 25, 2024 · ed1e695 · ed1e695
1 parent 65b7194
commit ed1e695
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/dinky-admin/src/test/java/org/dinky/utils/SqlUtilTest.java b/dinky-admin/src/test/java/org/dinky/utils/SqlUtilTest.java
@@ -47,7 +47,14 @@ public void testRemoveNote() {
 
         String removedNoteSql = SqlUtil.removeNote(testSql);
         Assertions.assertThat(removedNoteSql).isNotNull();
-        Assertions.assertThat(removedNoteSql).isNotEqualTo(testSql);
+        Assertions.assertThat(removedNoteSql)
+                .isEqualTo("//test2\n" + "\n"
+                        + "\n"
+                        + "select 1 \n"
+                        + " from test # test9\n"
+                        + " where '1'  <> '-- ::.' //test6\n"
+                        + " and 1=1 \n"
+                        + " and 'zz' <> null;");
     }
 
     @Test

diff --git a/dinky-common/src/main/java/org/dinky/utils/SqlUtil.java b/dinky-common/src/main/java/org/dinky/utils/SqlUtil.java
@@ -60,7 +60,7 @@ public static String removeNote(String sql) {
             // Remove the special-space characters
             sql = sql.replaceAll("\u00A0", " ").replaceAll("[\r\n]+", "\n");
             // Remove annotations Support '--aa' , '/**aaa*/' , '//aa' , '#aaa'
-            Pattern p = Pattern.compile("(?ms)('(?:''|[^'])*')|--.*?$|//.*?$|/\\*[^+].*?\\*/|#.*?$|");
+            Pattern p = Pattern.compile("(?ms)('(?:''|[^'])*')|--.*?$|/\\*[^+].*?\\*/|");
             String presult = p.matcher(sql).replaceAll("$1");
             return presult.trim();
         }