refix #116

single line comment in sql will merge next line into before one.
XiaoMi · Nov 23, 2018 · e08a3b0 · e08a3b0
1 parent de99de7
commit e08a3b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/ast/testdata/TestSplitStatement.golden b/ast/testdata/TestSplitStatement.golden
@@ -31,7 +31,10 @@ where col = 1
 --
 from tb
 where col = 1
-17 
+17 select * from
+-- comment
+tb;
+18 
 -- comment
 0 select * from test\Ghello
 1 select 'hello\Gworld', col from test\Ghello

diff --git a/ast/token.go b/ast/token.go
@@ -928,6 +928,7 @@ func SplitStatement(buf []byte, delimiter []byte) (string, string, []byte) {
 		if b == '\r' || b == '\n' {
 			if singleLineComment {
 				sql = string(buf[:i])
+				singleLineComment = false
 				if strings.HasPrefix(strings.TrimSpace(sql), "--") ||
 					strings.HasPrefix(strings.TrimSpace(sql), "#") {
 					// just comment, query start with '--', '#'

diff --git a/ast/token_test.go b/ast/token_test.go
@@ -146,6 +146,10 @@ where col = 1`),
 --
 from tb
 where col = 1`),
+		[]byte(`select * from
+-- comment
+tb;
+select col from tb where col = 1;`),
 		// https://github.com/XiaoMi/soar/issues/120
 		[]byte(`
 -- comment