Revert "Add comment support to JPQL console (#16)" (#17)

This reverts commit f32879f.
mariodavid · Nov 29, 2017 · 4cd1c08 · 4cd1c08
1 parent f32879f
commit 4cd1c08
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 76 deletions.
diff --git a/img/sql-console-screenshot.png b/img/sql-console-screenshot.png
diff --git a/modules/core/src/de/diedavids/cuba/runtimediagnose/db/DbQueryParser.groovy b/modules/core/src/de/diedavids/cuba/runtimediagnose/db/DbQueryParser.groovy
@@ -27,7 +27,6 @@ import net.sf.jsqlparser.statement.update.Update
 import org.springframework.stereotype.Component
 
 import javax.inject.Inject
-import java.util.regex.Pattern
 
 @Component
 class DbQueryParser {
@@ -66,8 +65,7 @@ class DbQueryParser {
 
 
         if (DiagnoseType.JPQL == diagnoseType) {
-            String queryStringWithoutComments = excludeComments(queryString)
-            analyseJpql(queryStringWithoutComments)
+            analyseJpql(queryString)
         }
 
         statements
@@ -111,11 +109,4 @@ class DbQueryParser {
 
         containsIllegalOperation
     }
-
-    String excludeComments(String queryString) {
-        Pattern.compile('/\\*.*?\\*/', Pattern.DOTALL)
-                .matcher(queryString)
-                .replaceAll('')
-                .replaceAll('--.*\n?', '')
-    }
 }
diff --git a/modules/core/test/de/diedavids/cuba/runtimediagnose/db/DbQueryParserSpec.groovy b/modules/core/test/de/diedavids/cuba/runtimediagnose/db/DbQueryParserSpec.groovy
@@ -9,7 +9,6 @@ import net.sf.jsqlparser.statement.Statements
 import net.sf.jsqlparser.statement.drop.Drop
 import net.sf.jsqlparser.statement.insert.Insert
 import spock.lang.Specification
-import spock.lang.Unroll
 
 class DbQueryParserSpec extends Specification {
 
@@ -136,69 +135,4 @@ class DbQueryParserSpec extends Specification {
         dropStatement instanceof SetStatement
         dropStatement.toString() == "SET OPTION = VALUE"
     }
-
-    @Unroll
-    def "excludeComments excludes single line and multiline comments from SQL query (#type)"() {
-        given:
-        def escape = { String str -> str.replace('*', '\\*')}
-
-        when:
-        String result = sut.excludeComments(query)
-
-        then:
-        result ==~ /\s*${escape("select * from SEC_USER")}\s*/
-
-        where:
-        query << [
-"""-- first comment
-select * from SEC_USER""",
-
-"""
-/* multi-line
-   comment*/
-select * from SEC_USER""",
-
-"""
-/* multi-line
-   line */
--- single line comment
-select * from SEC_USER"""]
-        type << ["single line", "multi-line", "mixing"]
-    }
-
-    @Unroll
-    def "analyseQueryString exludes comments in JPQL queries (#type)"() {
-        given:
-        def localSut = new DbQueryParser() {
-            @Override
-            void analyseJpql(String queryString) {}
-        }
-        localSut.with {
-            configuration = runtimeDiagnoseConfiguration
-            messages = messages
-        }
-
-        when:
-        Statements result = localSut.analyseQueryString(query, DiagnoseType.JPQL)
-
-        then:
-        result.statements[0].toString() == "select * from SEC_USER".toUpperCase()
-
-        where:
-        query << [
-"""-- first comment
-select * from SEC_USER""",
-
-"""
-/* multi-line
-   comment*/
-select * from SEC_USER""",
-
-"""
-/* multi-line
-   line */
--- single line comment
-select * from SEC_USER"""]
-        type << ["single line", "multi-line", "mixing"]
-    }
 }