llvy.ltd/bee
1
0
Fork 0
mirror of https://github.com/casbin/bee.git synced 2025-07-18 05:04:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from sergeylanzman/go-lint

Browse Source 
go lint
This commit is contained in:
astaxie
2016-07-24 00:02:59 +08:00
committed by GitHub
parent 1e5a7ec9a5 bc963e0070
commit 164fffe612
12 changed files with 93 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
g_scaffold.go
View File

@ -57,11 +57,11 @@ func generateSQLFromFields(fields string) string {
typ, tag := "", ""
switch driver {
case "mysql":
typ, tag = getSqlTypeMysql(kv[1])
typ, tag = getSQLTypeMysql(kv[1])
case "postgres":
typ, tag = getSqlTypePostgresql(kv[1])
typ, tag = getSQLTypePostgresql(kv[1])
default:
typ, tag = getSqlTypeMysql(kv[1])
typ, tag = getSQLTypeMysql(kv[1])
}
if typ == "" {
ColorLog("[ERRO] Fields format is wrong. Should be: key:type,key:type " + v + "\n")
@ -93,15 +93,14 @@ func generateSQLFromFields(fields string) string {
return sql
}
func getSqlTypeMysql(ktype string) (tp, tag string) {
func getSQLTypeMysql(ktype string) (tp, tag string) {
kv := strings.SplitN(ktype, ":", 2)
switch kv[0] {
case "string":
if len(kv) == 2 {
return "varchar(" + kv[1] + ") NOT NULL", ""
} else {
return "varchar(128) NOT NULL", ""
}
return "varchar(128) NOT NULL", ""
case "text":
return "longtext NOT NULL", ""
case "auto":
@ -124,15 +123,14 @@ func getSqlTypeMysql(ktype string) (tp, tag string) {
return "", ""
}
func getSqlTypePostgresql(ktype string) (tp, tag string) {
func getSQLTypePostgresql(ktype string) (tp, tag string) {
kv := strings.SplitN(ktype, ":", 2)
switch kv[0] {
case "string":
if len(kv) == 2 {
return "char(" + kv[1] + ") NOT NULL", ""
} else {
return "TEXT NOT NULL", ""
}
return "TEXT NOT NULL", ""
case "text":
return "TEXT NOT NULL", ""
case "auto", "pk":