Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sql field comment semicolon with escape #4967

Merged
merged 3 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,32 @@ trait CommentHelper {
object SQLCommentHelper extends CommentHelper {
override val commentPattern: Regex = """\s*--.+\s*""".r.unanchored
private val comment = "(?ms)('(?:''|[^'])*')|--.*?$|/\\*.*?\\*/|#.*?$|"
private val comment_sem = "(?i)(comment)\\s+'([^']*)'"
private val logger: Logger = LoggerFactory.getLogger(getClass)

def replaceComment(code: String): String = {
try {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to add junit test case for this new function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok,I do

val pattern = Pattern.compile(comment_sem)
val matcher = pattern.matcher(code)
val sb = new StringBuffer
while (matcher.find()) {
val commentKeyword = matcher.group(1)
val comment = matcher.group(2)
val escapedComment = comment.replaceAll(";", "\\\\\\\\;")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

batter to add some comments to explain for using "\\\\" (eight )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please review again.Thanks!

matcher.appendReplacement(sb, commentKeyword + " '" + escapedComment + "'")
}
matcher.appendTail(sb)
sb.toString
} catch {
case e: Exception =>
logger.warn("sql comment semicolon replace failed")
code
case t: Throwable =>
logger.warn("sql comment semicolon replace failed")
code
}
}

override def dealComment(code: String): String = {
try {
val p = Pattern.compile(comment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ object SQLExplain extends Explain {
logAppender: java.lang.StringBuilder
): Unit = {
val fixedCode: ArrayBuffer[String] = new ArrayBuffer[String]()
val tempCode = SQLCommentHelper.dealComment(executionCode)
val tempCode1 = SQLCommentHelper.dealComment(executionCode)
val tempCode = SQLCommentHelper.replaceComment(tempCode1)
val isNoLimitAllowed = Utils.tryCatch {
IDE_ALLOW_NO_LIMIT_REGEX.findFirstIn(executionCode).isDefined
} { case e: Exception =>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.linkis.entrance.interceptor.impl

import org.junit.jupiter.api.{Assertions, Test}

class TestReplaceComment {


@Test
def TestRepComm: Unit = {
val realCode = "drop table if exists default.test;" +
"create table default.test(" +
"id varchar(11) comment '这是注释测试分号;这是注释测试分号;'," +
"id1 string comment '测试'," +
"id2 string COMMENT '码值说明:2-高;3-中;4-低;'" +
");"
val expectCode = "drop table if exists default.test;" +
"create table default.test(" +
"id varchar(11) comment '这是注释测试分号\\;这是注释测试分号\\;'," +
"id1 string comment '测试'," +
"id2 string COMMENT '码值说明:2-高\\;3-中\\;4-低\\;'" +
");"

Assertions.assertEquals(SQLCommentHelper.replaceComment(realCode), expectCode)
}

}
Loading