Skip to content

S
soar

m0_67397764 / soar
与 Fork 源项目一致

Fork自 Xiaomi / soar

通知 1
Star 0
Fork 0
S
soar

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 407db8a0 编写于 作者: martianzhang's avatar martianzhang
浏览文件
操作

test cases

上级 425106ed
隐藏空白更改
内联 并排
Showing with 74 addition and 38 deletion
CHANGES.md
浏览文件 @ 407db8a0
...@@ -8,12 +8,14 @@ ...@@ -8,12 +8,14 @@
- command line dsn args support '@', '/', ':' in password - command line dsn args support '@', '/', ':' in password
- add new heuristic rule RES.009, "SELECT * FROM tbl WHERE col = col = 'abc'" - add new heuristic rule RES.009, "SELECT * FROM tbl WHERE col = col = 'abc'"
- add new heuristic rule RuleColumnNotAllowType COL.018 - add new heuristic rule RuleColumnNotAllowType COL.018
- add string escape function for security
- fix #122 single table select * don't auto-complete table name
- fix #171 support socket access type
- fix #58 sampling not deal with NULL able string - fix #58 sampling not deal with NULL able string
- fix #172 compatible with mysql 5.1, which explain has no Index_Comment column - fix #172 compatible with mysql 5.1, which explain has no Index_Comment column
- fix #163 column.Tp may be nil, which may raise panic - fix #163 column.Tp may be nil, which may raise panic
- fix #151 bit type not config as int, when two columns compare will give ARG.003 suggestion. - fix #151 bit type not config as int, when two columns compare will give ARG.003 suggestion.
- -
## 2018-11 ## 2018-11
- add all third-party lib into vendor - add all third-party lib into vendor
......
cmd/soar/soar_test.go
浏览文件 @ 407db8a0
...@@ -47,6 +47,8 @@ func Test_Main(_ *testing.T) { ...@@ -47,6 +47,8 @@ func Test_Main(_ *testing.T) {
common.Log.Debug("Entering function: %s", common.GetFunctionName()) common.Log.Debug("Entering function: %s", common.GetFunctionName())
common.Config.OnlineDSN.Disable = true common.Config.OnlineDSN.Disable = true
common.Config.LogLevel = 0 common.Config.LogLevel = 0
common.Config.Query = "select * syntaxError"
main()
common.Config.Query = "select * from film;alter table city add index idx_country_id(country_id);" common.Config.Query = "select * from film;alter table city add index idx_country_id(country_id);"
main() main()
common.Log.Debug("Exiting function: %s", common.GetFunctionName()) common.Log.Debug("Exiting function: %s", common.GetFunctionName())
......
common/config.go
浏览文件 @ 407db8a0
...@@ -426,6 +426,7 @@ func parseDSN(odbc string, d *Dsn) *Dsn { ...@@ -426,6 +426,7 @@ func parseDSN(odbc string, d *Dsn) *Dsn {
func ParseDSN(odbc string, d *Dsn) *Dsn { func ParseDSN(odbc string, d *Dsn) *Dsn {
cfg, err := mysql.ParseDSN(odbc) cfg, err := mysql.ParseDSN(odbc)
if err != nil { if err != nil {
Log.Warn("go-sql-driver/mysql.ParseDSN Error: %s, DSN: %s, try to use old version parseDSN", err.Error(), odbc)
return parseDSN(odbc, d) return parseDSN(odbc, d)
} }
return newDSN(cfg) return newDSN(cfg)
......
common/config_test.go
浏览文件 @ 407db8a0
...@@ -94,6 +94,7 @@ func TestParseDSN(t *testing.T) { ...@@ -94,6 +94,7 @@ func TestParseDSN(t *testing.T) {
"user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped", "user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped",
"user:password@/dbname", "user:password@/dbname",
"user:password@/", "user:password@/",
"user:password@tcp(localhost:3307)/database?charset=utf8&timeout=5s",
} }
err := GoldenDiff(func() { err := GoldenDiff(func() {
......
common/testdata/TestParseDSN.golden
浏览文件 @ 407db8a0
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@hostname:3307/database user:password@hostname:3307/database
...@@ -39,7 +39,7 @@ user:password@hostname:3307/database ...@@ -39,7 +39,7 @@ user:password@hostname:3307/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@hostname:3307/database?charset=utf8 user:password@hostname:3307/database?charset=utf8
...@@ -61,7 +61,7 @@ user:password@hostname:3307/database?charset=utf8 ...@@ -61,7 +61,7 @@ user:password@hostname:3307/database?charset=utf8
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@hostname:3307 user:password@hostname:3307
...@@ -83,7 +83,7 @@ user:password@hostname:3307 ...@@ -83,7 +83,7 @@ user:password@hostname:3307
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@hostname:/database user:password@hostname:/database
...@@ -105,7 +105,7 @@ user:password@hostname:/database ...@@ -105,7 +105,7 @@ user:password@hostname:/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@:3307/database user:password@:3307/database
...@@ -127,7 +127,7 @@ user:password@:3307/database ...@@ -127,7 +127,7 @@ user:password@:3307/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user@hostname/database user@hostname/database
...@@ -149,7 +149,7 @@ user@hostname/database ...@@ -149,7 +149,7 @@ user@hostname/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:pwd:pwd@pwd/pwd@hostname/database user:pwd:pwd@pwd/pwd@hostname/database
...@@ -171,7 +171,7 @@ user:pwd:pwd@pwd/pwd@hostname/database ...@@ -171,7 +171,7 @@ user:pwd:pwd@pwd/pwd@hostname/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@ user:password@
...@@ -193,7 +193,7 @@ user:password@ ...@@ -193,7 +193,7 @@ user:password@
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
hostname:3307/database hostname:3307/database
...@@ -215,7 +215,7 @@ hostname:3307/database ...@@ -215,7 +215,7 @@ hostname:3307/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
@hostname:3307/database @hostname:3307/database
...@@ -237,7 +237,7 @@ hostname:3307/database ...@@ -237,7 +237,7 @@ hostname:3307/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
@hostname @hostname
...@@ -259,7 +259,7 @@ hostname:3307/database ...@@ -259,7 +259,7 @@ hostname:3307/database
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
hostname hostname
...@@ -281,7 +281,7 @@ hostname ...@@ -281,7 +281,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
@/database @/database
...@@ -303,7 +303,7 @@ hostname ...@@ -303,7 +303,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
@hostname:3307 @hostname:3307
...@@ -325,7 +325,7 @@ hostname ...@@ -325,7 +325,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
@:3307/database @:3307/database
...@@ -347,7 +347,7 @@ hostname ...@@ -347,7 +347,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
:3307/database :3307/database
...@@ -369,7 +369,7 @@ hostname ...@@ -369,7 +369,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
/database /database
...@@ -391,7 +391,7 @@ hostname ...@@ -391,7 +391,7 @@ hostname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user@unix(/path/to/socket)/dbname user@unix(/path/to/socket)/dbname
...@@ -413,7 +413,7 @@ user@unix(/path/to/socket)/dbname ...@@ -413,7 +413,7 @@ user@unix(/path/to/socket)/dbname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
root:pw@unix(/tmp/mysql.sock)/myDatabase?loc=Local root:pw@unix(/tmp/mysql.sock)/myDatabase?loc=Local
...@@ -435,7 +435,7 @@ root:pw@unix(/tmp/mysql.sock)/myDatabase?loc=Local ...@@ -435,7 +435,7 @@ root:pw@unix(/tmp/mysql.sock)/myDatabase?loc=Local
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@tcp(localhost:5555)/dbname?tls=skip-verify&autocommit=true user:password@tcp(localhost:5555)/dbname?tls=skip-verify&autocommit=true
...@@ -457,7 +457,7 @@ user:password@tcp(localhost:5555)/dbname?tls=skip-verify&autocommit=true ...@@ -457,7 +457,7 @@ user:password@tcp(localhost:5555)/dbname?tls=skip-verify&autocommit=true
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@/dbname?sql_mode=TRADITIONAL user:password@/dbname?sql_mode=TRADITIONAL
...@@ -479,7 +479,7 @@ user:password@/dbname?sql_mode=TRADITIONAL ...@@ -479,7 +479,7 @@ user:password@/dbname?sql_mode=TRADITIONAL
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@tcp([de:ad:be:ef::ca:fe]:80)/dbname?timeout=90s&collation=utf8mb4_unicode_ci user:password@tcp([de:ad:be:ef::ca:fe]:80)/dbname?timeout=90s&collation=utf8mb4_unicode_ci
...@@ -501,7 +501,7 @@ user:password@tcp([de:ad:be:ef::ca:fe]:80)/dbname?timeout=90s&collation=utf8mb4_ ...@@ -501,7 +501,7 @@ user:password@tcp([de:ad:be:ef::ca:fe]:80)/dbname?timeout=90s&collation=utf8mb4_
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
id:password@tcp(your-amazonaws-uri.com:3306)/dbname id:password@tcp(your-amazonaws-uri.com:3306)/dbname
...@@ -523,7 +523,7 @@ id:password@tcp(your-amazonaws-uri.com:3306)/dbname ...@@ -523,7 +523,7 @@ id:password@tcp(your-amazonaws-uri.com:3306)/dbname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user@cloudsql(project-id:instance-name)/dbname user@cloudsql(project-id:instance-name)/dbname
...@@ -545,7 +545,7 @@ user@cloudsql(project-id:instance-name)/dbname ...@@ -545,7 +545,7 @@ user@cloudsql(project-id:instance-name)/dbname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user@cloudsql(project-id:regionname:instance-name)/dbname user@cloudsql(project-id:regionname:instance-name)/dbname
...@@ -567,7 +567,7 @@ user@cloudsql(project-id:regionname:instance-name)/dbname ...@@ -567,7 +567,7 @@ user@cloudsql(project-id:regionname:instance-name)/dbname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped
...@@ -589,7 +589,7 @@ user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped ...@@ -589,7 +589,7 @@ user:password@tcp/dbname?charset=utf8mb4,utf8&sys_var=esc%40ped
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@/dbname user:password@/dbname
...@@ -611,7 +611,7 @@ user:password@/dbname ...@@ -611,7 +611,7 @@ user:password@/dbname
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999, Version: 99999,
} }
user:password@/ user:password@/
...@@ -633,6 +633,28 @@ user:password@/ ...@@ -633,6 +633,28 @@ user:password@/
WriteTimeout: 0, WriteTimeout: 0,
AllowNativePasswords: true, AllowNativePasswords: true,
AllowOldPasswords: false, AllowOldPasswords: false,
Disable: true, Disable: false,
Version: 99999,
}
user:password@tcp(localhost:3307)/database?charset=utf8&timeout=5s
&common.Dsn{
User: "user",
Password: "password",
Net: "tcp",
Addr: "localhost:3307",
Schema: "database",
Charset: "utf8",
Collation: "utf8_general_ci",
Loc: "UTC",
TLS: "",
ServerPubKey: "",
MaxAllowedPacket: 4194304,
Params: {"charset":"utf8"},
Timeout: 5,
ReadTimeout: 0,
WriteTimeout: 0,
AllowNativePasswords: true,
AllowOldPasswords: false,
Disable: false,
Version: 99999, Version: 99999,
} }
database/testdata/TestTrace.golden
浏览文件 @ 407db8a0
[]database.TraceRow{ select 1 []database.TraceRow{
{Query:"explain select 1", Trace:"{\n \"steps\": [\n {\n \"join_preparation\": {\n \"select#\": 1,\n \"steps\": [\n {\n \"expanded_query\": \"/* select#1 */ select 1 AS `1`\"\n }\n ]\n }\n },\n {\n \"join_optimization\": {\n \"select#\": 1,\n \"steps\": [\n ]\n }\n },\n {\n \"join_explain\": {\n \"select#\": 1,\n \"steps\": [\n ]\n }\n }\n ]\n}", MissingBytesBeyondMaxMemSize:0, InsufficientPrivileges:0}, {Query:"explain select 1", Trace:"{\n \"steps\": [\n {\n \"join_preparation\": {\n \"select#\": 1,\n \"steps\": [\n {\n \"expanded_query\": \"/* select#1 */ select 1 AS `1`\"\n }\n ]\n }\n },\n {\n \"join_optimization\": {\n \"select#\": 1,\n \"steps\": [\n ]\n }\n },\n {\n \"join_explain\": {\n \"select#\": 1,\n \"steps\": [\n ]\n }\n }\n ]\n}", MissingBytesBeyondMaxMemSize:0, InsufficientPrivileges:0},
} } nil
explain select 1 []database.TraceRow(nil) &errors.errorString{s:"no need trace"}
database/trace_test.go
浏览文件 @ 407db8a0
...@@ -26,13 +26,16 @@ import ( ...@@ -26,13 +26,16 @@ import (
func TestTrace(t *testing.T) { func TestTrace(t *testing.T) {
common.Log.Debug("Entering function: %s", common.GetFunctionName()) common.Log.Debug("Entering function: %s", common.GetFunctionName())
res, err := connTest.Trace("select 1") sqls := []string{
if err != nil { "select 1",
t.Error(err) "explain select 1",
"show create table film",
} }
err := common.GoldenDiff(func() {
err = common.GoldenDiff(func() { for _, sql := range sqls {
pretty.Println(res) res, err := connTest.Trace(sql)
pretty.Println(sql, res, err)
}
}, t.Name(), update) }, t.Name(), update)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
......
env/env_test.go
浏览文件 @ 407db8a0
...@@ -61,6 +61,8 @@ func TestMain(m *testing.M) { ...@@ -61,6 +61,8 @@ func TestMain(m *testing.M) {
func TestNewVirtualEnv(t *testing.T) { func TestNewVirtualEnv(t *testing.T) {
common.Log.Debug("Entering function: %s", common.GetFunctionName()) common.Log.Debug("Entering function: %s", common.GetFunctionName())
testSQL := []string{ testSQL := []string{
"use sakila",
"select frm syntaxError",
"create table t(id int,c1 varchar(20),PRIMARY KEY (id));", "create table t(id int,c1 varchar(20),PRIMARY KEY (id));",
"alter table t add index `idx_c1`(c1);", "alter table t add index `idx_c1`(c1);",
"select * from city where country_id = 44;", "select * from city where country_id = 44;",
......
env/testdata/TestNewVirtualEnv.golden
浏览文件 @ 407db8a0
use sakila OK
select frm syntaxError OK
create table t(id int,c1 varchar(20),PRIMARY KEY (id)); OK create table t(id int,c1 varchar(20),PRIMARY KEY (id)); OK
alter table t add index `idx_c1`(c1); OK alter table t add index `idx_c1`(c1); OK
select * from city where country_id = 44; OK select * from city where country_id = 44; OK
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或