add comment and test case for RemoveSQLComments

jerry-00 · Apr 27, 2020 · f12c263 · f12c263
1 parent 1f50907
commit f12c263
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/database/mysql.go b/database/mysql.go
@@ -252,9 +252,14 @@ func (db *Connector) IsView(tbName string) bool {
 // RemoveSQLComments 去除SQL中的注释
 func RemoveSQLComments(sql string) string {
 	buf := []byte(sql)
-	cmtReg := regexp.MustCompile(`("(""|[^"])*")|('(''|[^'])*')|(--[^\n\r]*)|(#.*)|(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)`)
-
-	res := cmtReg.ReplaceAllFunc(buf, func(s []byte) []byte {
+	// ("(""|[^"])*") 双引号中的内容
+	// ('(''|[^'])*') 单引号中的内容
+	// (--[^\n\r]*) 双减号注释
+	// (#.*) 井号注释
+	// (/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/) 多行注释
+	commentRegex := regexp.MustCompile(`("(""|[^"])*")|('(''|[^'])*')|(--[^\n\r]*)|(#.*)|(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)`)
+
+	res := commentRegex.ReplaceAllFunc(buf, func(s []byte) []byte {
 		if (s[0] == '"' && s[len(s)-1] == '"') ||
 			(s[0] == '\'' && s[len(s)-1] == '\'') ||
 			(string(s[:3]) == "/*!") {

diff --git a/database/mysql_test.go b/database/mysql_test.go
@@ -146,17 +146,18 @@ func TestVersion(t *testing.T) {
 }
 
 func TestRemoveSQLComments(t *testing.T) {
+	// Notice: double dash without space not comment, eg. `--not comment`
 	common.Log.Debug("Entering function: %s", common.GetFunctionName())
 	SQLs := []string{
 		`-- comment`,
 		`--`,
 		`# comment`,
+		`#comment`,
 		`/* multi-line
 comment*/`,
 		`--
 -- comment`,
 	}
-
 	err := common.GoldenDiff(func() {
 		for _, sql := range SQLs {
 			fmt.Println(RemoveSQLComments(sql))

diff --git a/database/testdata/TestRemoveSQLComments.golden b/database/testdata/TestRemoveSQLComments.golden
@@ -3,3 +3,4 @@
 
 
 
+