Skip to content

Commit 8ddbb43

Browse files
committed
Trim all right-most semicolons with strings.TrimRight in planbuilder.Parse
1 parent 2b0d161 commit 8ddbb43

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

sql/planbuilder/parse.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ func parse(ctx *sql.Context, cat sql.Catalog, query string, multi bool) (sql.Nod
3737
defer span.End()
3838

3939
s := strings.TrimSpace(query)
40-
if strings.HasSuffix(s, ";") {
41-
s = s[:len(s)-1]
42-
}
40+
s = strings.TrimRight(s, ";") // trim all right-most semicolons
4341

4442
var stmt sqlparser.Statement
4543
var err error
@@ -55,9 +53,7 @@ func parse(ctx *sql.Context, cat sql.Catalog, query string, multi bool) (sql.Nod
5553
if ri != 0 && ri < len(s) {
5654
parsed = s[:ri]
5755
parsed = strings.TrimSpace(parsed)
58-
if strings.HasSuffix(parsed, ";") {
59-
parsed = parsed[:len(parsed)-1]
60-
}
56+
parsed = strings.TrimRight(parsed, ";") // trim all right-most semicolons
6157
remainder = s[ri:]
6258
}
6359
}

0 commit comments

Comments
 (0)