diff --git a/ast/pretty_test.go b/ast/pretty_test.go index 15a4ef5657dd76aa12178df68b8f2a0e2c0904b0..9c0a002832e36b3600dcbe334a30969c09ca0ef9 100644 --- a/ast/pretty_test.go +++ b/ast/pretty_test.go @@ -131,6 +131,10 @@ func TestPretty(t *testing.T) { fmt.Println(sql) fmt.Println(Pretty(sql, "builtin")) } + orgMaxPrettySQLLength := common.Config.MaxPrettySQLLength + common.Config.MaxPrettySQLLength = 1 + fmt.Println(Pretty("select 1", "builtin")) + common.Config.MaxPrettySQLLength = orgMaxPrettySQLLength }, t.Name(), update) if nil != err { t.Fatal(err) diff --git a/ast/testdata/TestPretty.golden b/ast/testdata/TestPretty.golden index 95f55297014665b71fece1f7ebf6363511f6889d..6aa57d445421f6f2305974c5180ed727cece9c14 100644 --- a/ast/testdata/TestPretty.golden +++ b/ast/testdata/TestPretty.golden @@ -1100,26 +1100,25 @@ SELECT c. city_id FROM sakila. city c); -SELECT visitor_id, url FROM (SELECT id FROM log WHERE ip="123.45.67.89" order by ts desc limit 50, 10) I JOIN log ON (I.id=log.id) JOIN url ON (url.id=log.url_id) order by TS desc; +SELECT city FROM( SELECT city_id FROM city WHERE city = "A Corua (La Corua)" ORDER BY last_update DESC LIMIT 50, 10) I JOIN city ON (I.city_id = city.city_id) JOIN country ON (country.country_id = city.country_id) ORDER BY city DESC; SELECT - visitor_id, url -FROM - ( + city +FROM( SELECT - id + city_id FROM - LOG + city WHERE - ip= "123.45.67.89" + city = "A Corua (La Corua)" ORDER BY - ts desc + last_update DESC LIMIT 50, 10) I - JOIN LOG ON (I. id= LOG. id) - JOIN url ON (url. id= LOG. url_id) + JOIN city ON (I. city_id = city. city_id) + JOIN country ON (country. country_id = city. country_id) ORDER BY - TS desc; + city DESC; DELETE city, country FROM city INNER JOIN country using (country_id) WHERE city.city_id = 1; DELETE city, country FROM @@ -1490,24 +1489,24 @@ ADD ADD index `idx_store_film` ( `store_id`, `film_id`); -SELECT DATE_FORMAT(t.atm, '%Y-%m-%d'), COUNT(DISTINCT (t.usr)) FROM usr_terminal t WHERE t.atm > '2018-10-22 00:00:00' AND t.agent LIKE '%Chrome%' AND t.system = 'eip' GROUP BY DATE_FORMAT(t.atm, '%Y-%m-%d') ORDER BY DATE_FORMAT(t.atm, '%Y-%m-%d'); +SELECT DATE_FORMAT(t.last_update, '%Y-%m-%d'), COUNT(DISTINCT (t.city)) FROM city t WHERE t.last_update > '2018-10-22 00:00:00' AND t.city LIKE '%Chrome%' AND t.city = 'eip' GROUP BY DATE_FORMAT(t.last_update, '%Y-%m-%d') ORDER BY DATE_FORMAT(t.last_update, '%Y-%m-%d'); SELECT - DATE_FORMAT( t. atm, '%Y-%m-%d' + DATE_FORMAT( t. last_update, '%Y-%m-%d' ), COUNT( DISTINCT ( - t. usr)) + t. city)) FROM - usr_terminal t + city t WHERE - t. atm > '2018-10-22 00:00:00' - AND t. agent LIKE '%Chrome%' - AND t. system = 'eip' + t. last_update > '2018-10-22 00:00:00' + AND t. city LIKE '%Chrome%' + AND t. city = 'eip' GROUP BY - DATE_FORMAT( t. atm, '%Y-%m-%d' + DATE_FORMAT( t. last_update, '%Y-%m-%d' ) ORDER BY - DATE_FORMAT( t. atm, '%Y-%m-%d' + DATE_FORMAT( t. last_update, '%Y-%m-%d' ); create table hello.t (id int unsigned); create table hello. t (id int unsigned); @@ -1525,3 +1524,4 @@ ALTER TABLE tb alter column id DROP DEFAULT; +select 1 diff --git a/ast/testdata/TestStmtNode2JSON.golden b/ast/testdata/TestStmtNode2JSON.golden index 2ac531447657fbf063b3d20d48f9cb091be65f23..407d399e7e56a32ced437135ce4018dccf35d4bf 100644 --- a/ast/testdata/TestStmtNode2JSON.golden +++ b/ast/testdata/TestStmtNode2JSON.golden @@ -42,3 +42,4 @@ "IsInBraces": false } ] + diff --git a/ast/testdata/TestVitessStmtNode2JSON.golden b/ast/testdata/TestVitessStmtNode2JSON.golden index 2f440983f5c43a6e1c1ecd4521c5027d9617542f..155fd390726a76fc77c5edc618ba46bc2431fdd3 100644 --- a/ast/testdata/TestVitessStmtNode2JSON.golden +++ b/ast/testdata/TestVitessStmtNode2JSON.golden @@ -30,3 +30,4 @@ "Limit": null, "Lock": "" } + diff --git a/ast/tidb_test.go b/ast/tidb_test.go index 72d210d064509619cde393d738431b57e321fecc..641ff0ca049b1412270caa1ae5519728b2fef25b 100644 --- a/ast/tidb_test.go +++ b/ast/tidb_test.go @@ -27,6 +27,7 @@ func TestPrintPrettyStmtNode(t *testing.T) { common.Log.Debug("Entering function: %s", common.GetFunctionName()) sqls := []string{ `select 1`, + `select * f`, // syntax error case } err := common.GoldenDiff(func() { for _, sql := range sqls { @@ -43,6 +44,7 @@ func TestStmtNode2JSON(t *testing.T) { common.Log.Debug("Entering function: %s", common.GetFunctionName()) sqls := []string{ `select 1`, + `select * f`, // syntax error case } err := common.GoldenDiff(func() { for _, sql := range sqls { diff --git a/ast/vitess_test.go b/ast/vitess_test.go index 45ce5501689aa1ada88ae5d8c0e6d323099741ce..c50e92988cb1609250ea488997ce4bd7ffb31f70 100644 --- a/ast/vitess_test.go +++ b/ast/vitess_test.go @@ -27,6 +27,7 @@ func TestPrintPrettyVitessStmtNode(t *testing.T) { common.Log.Debug("Entering function: %s", common.GetFunctionName()) sqls := []string{ `select 1`, + `select * f`, // syntax error case } err := common.GoldenDiff(func() { for _, sql := range sqls { @@ -43,6 +44,7 @@ func TestVitessStmtNode2JSON(t *testing.T) { common.Log.Debug("Entering function: %s", common.GetFunctionName()) sqls := []string{ `select 1`, + `select * f`, // syntax error case } err := common.GoldenDiff(func() { for _, sql := range sqls {