fix(sql_parser): normalize before parse

Author: cp-20

analyzer/analyzer.go

@@ -45,18 +45,16 @@ func (a *analyzer) analyzeQueries(queries []string) (domains.CachePlan, error) {
 	planErr := &analyzerError{}
 	for _, query := range queries {
 		week := false
-		normalized := normalizer.NormalizeQuery(query)
-		parsed, err := sql_parser.ParseSQL(normalized)
+		query = normalizer.NormalizeQuery(query)
+		parsed, err := sql_parser.ParseSQL(query)
 		if err != nil {
 			weekParsed, weekErr := sql_parser.ParseSQLWeekly(query)
 			if weekErr != nil {
-				planErr.errors = append(planErr.errors, fmt.Errorf("failed to parse query: %s / %s", err, weekErr))
+				planErr.errors = append(planErr.errors, fmt.Errorf("failed to parse query:\nmain -> %s\nweek -> %s", err, weekErr))
 				continue
 			}
 			parsed = weekParsed
 			week = true
-			fmt.Printf("week: %s\n", query)
-			fmt.Printf("err: %s\n", err)
 		}
 		analyzed, err := a.analyzeQuery(parsed)
 		if err != nil {

analyzer/analyzer_test.go

@@ -260,7 +260,7 @@ func TestAnalyzeQueries(t *testing.T) {
 					},
 					{
 						CachePlanQueryBase: &domains.CachePlanQueryBase{
-							Query: "UPDATE `users` SET `del_flg` = 1 WHERE `id` % 50 = 0;",
+							Query: "UPDATE users SET del_flg = 1 WHERE id % 50 = 0;",
 							Type:  domains.CachePlanQueryType_UPDATE,
 						},
 						Update: &domains.CachePlanUpdateQuery{
@@ -340,7 +340,7 @@ func TestAnalyzeQueries(t *testing.T) {
 					},
 					{
 						CachePlanQueryBase: &domains.CachePlanQueryBase{
-							Query: "SELECT `id`, `user_id`, `body`, `mime`, `created_at` FROM `posts` WHERE `created_at` <= ? ORDER BY `created_at` DESC;",
+							Query: "SELECT id, user_id, body, mime, created_at FROM posts WHERE created_at <= ? ORDER BY created_at DESC;",
 							Type:  domains.CachePlanQueryType_SELECT,
 						},
 						Select: &domains.CachePlanSelectQuery{

sql_parser/week_parser.go

@@ -24,6 +24,8 @@ func ParseSQLWeekly(query string) (SQLNode, error) {
 		return InsertStmtNode{Table: TableNode{Name: match["table"]}}, nil
 	}
 
+	// \n -> \\n
+	query = fmt.Sprintf("%q", query)
 	return nil, fmt.Errorf("failed to parse query: \"%s\"", query)
 }
 

sql_parser/week_parser_test.go

@@ -23,6 +23,10 @@ func TestParseSQLWeekly(t *testing.T) {
 			query: "UPDATE users SET del_flg = 1 WHERE id % 50 = 0",
 			node:  UpdateStmtNode{Table: TableNode{Name: "users"}},
 		},
+		{
+			query: "DELETE FROM livecomments WHERE id = ? AND livestream_id = ? AND (SELECT COUNT(*) FROM (SELECT ? AS text) AS texts INNER JOIN (SELECT CONCAT('%', ?, '%') AS pattern) AS patterns ON texts.text LIKE patterns.pattern) >= 1;",
+			node:  DeleteStmtNode{Table: TableNode{Name: "livecomments"}},
+		},
 	}
 
 	for _, test := range tests {