提交 153c0c51 编写于 作者: martianzhang's avatar martianzhang

fix #61 🐛

上级 b98039eb
...@@ -122,6 +122,9 @@ var TestSqlsPretty = []string{ ...@@ -122,6 +122,9 @@ var TestSqlsPretty = []string{
// MODIFY & CHANGE // MODIFY & CHANGE
"ALTER TABLE t1 MODIFY col1 BIGINT UNSIGNED DEFAULT 1 COMMENT 'my column';", "ALTER TABLE t1 MODIFY col1 BIGINT UNSIGNED DEFAULT 1 COMMENT 'my column';",
"ALTER TABLE t1 CHANGE b a INT NOT NULL;", "ALTER TABLE t1 CHANGE b a INT NOT NULL;",
// COMMENT
"/*!40000 select 1*/;",
} }
func TestPretty(t *testing.T) { func TestPretty(t *testing.T) {
......
...@@ -176,6 +176,8 @@ FROM ...@@ -176,6 +176,8 @@ FROM
SELECT /*!40001 SQL_NO_CACHE */ * FROM `film` SELECT /*!40001 SQL_NO_CACHE */ * FROM `film`
SELECT SELECT
/*!40001 SQL_NO_CACHE
*/ * */ *
FROM FROM
`film` `film`
...@@ -363,7 +365,9 @@ SELECT ...@@ -363,7 +365,9 @@ SELECT
FROM FROM
table table
WHERE WHERE
FIELD = 'value' */ FIELD = 'value'
/*arbitrary/31
*/
SELECT * FROM table WHERE field = 'value' /*arbitrary31*/ SELECT * FROM table WHERE field = 'value' /*arbitrary31*/
SELECT SELECT
...@@ -371,7 +375,9 @@ SELECT ...@@ -371,7 +375,9 @@ SELECT
FROM FROM
table table
WHERE WHERE
FIELD = 'value' */ FIELD = 'value'
/*arbitrary31
*/
SELECT * FROM t WHERE 1=1 AND id=1 SELECT * FROM t WHERE 1=1 AND id=1
SELECT SELECT
...@@ -503,6 +509,8 @@ HAVING ...@@ -503,6 +509,8 @@ HAVING
1, 0) 1, 0)
)= 0 )= 0
/* -- S++ SU ABORTABLE -- spd_user: rspadim */SELECT SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade FROM est_dia WHERE unidade_id=1001 AND item_id=67 AND item_id_red=573 /* -- S++ SU ABORTABLE -- spd_user: rspadim */SELECT SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade FROM est_dia WHERE unidade_id=1001 AND item_id=67 AND item_id_red=573
/* -- S++ SU ABORTABLE -- spd_user: rspadim
*/ */
SELECT SELECT
SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade SQL_SMALL_RESULT SQL_CACHE DISTINCT centro_atividade
...@@ -630,6 +638,10 @@ ALTER TABLE t1 CHANGE b a INT NOT NULL; ...@@ -630,6 +638,10 @@ ALTER TABLE t1 CHANGE b a INT NOT NULL;
ALTER TABLE ALTER TABLE
t1 CHANGE b a INT NOT NULL; t1 CHANGE b a INT NOT NULL;
/*!40000 select 1*/;
/*!40000 select 1
*/;
SELECT * FROM film WHERE length = 86; SELECT * FROM film WHERE length = 86;
SELECT SELECT
......
...@@ -676,7 +676,7 @@ func getNextToken(buf string, previous Token) Token { ...@@ -676,7 +676,7 @@ func getNextToken(buf string, previous Token) Token {
} }
// Comment (#, --, /**/) // Comment (#, --, /**/)
if buf[0] == '#' || (len(buf) > 1 && (buf[0] == '-' && buf[1] == '-')) || (buf[0] == '/' && buf[1] == '*') { if buf[0] == '#' || (len(buf) > 1 && (buf[:2] == "--" || buf[:2] == "/*")) {
var last int var last int
if buf[0] == '-' || buf[0] == '#' { if buf[0] == '-' || buf[0] == '#' {
// Comment until end of line // Comment until end of line
...@@ -685,6 +685,7 @@ func getNextToken(buf string, previous Token) Token { ...@@ -685,6 +685,7 @@ func getNextToken(buf string, previous Token) Token {
} else { } else {
// Comment until closing comment tag // Comment until closing comment tag
last = strings.Index(buf[2:], "*/") + 2 last = strings.Index(buf[2:], "*/") + 2
typ = TokenTypeBlockComment
} }
if last == 0 { if last == 0 {
last = len(buf) last = len(buf)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册