-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 { | ||
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(";", "\\\\\\\\;") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. batter to add some comments to explain for using "\\\\" (eight ) There was a problem hiding this comment. Choose a reason for hiding this commentThe 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) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...rance/src/test/scala/org/apache/linkis/entrance/interceptor/impl/TestReplaceComment.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok,I do