1
0
mirror of https://github.com/beego/bee.git synced 2024-11-22 20:20:55 +00:00

Merge pull request #68 from ZhengYang/master

support for json type
This commit is contained in:
astaxie 2014-09-05 10:24:54 +08:00
commit 4bac7d36fc

View File

@ -129,6 +129,7 @@ var typeMappingPostgres = map[string]string{
"ARRAY": "string", // array "ARRAY": "string", // array
"USER-DEFINED": "string", // user defined "USER-DEFINED": "string", // user defined
"uuid": "string", // uuid "uuid": "string", // uuid
"json": "string", // json
} }
// Table represent a table in a database // Table represent a table in a database
@ -891,7 +892,7 @@ func formatSourceCode(filename string) {
func camelCase(in string) string { func camelCase(in string) string {
tokens := strings.Split(in, "_") tokens := strings.Split(in, "_")
for i := range tokens { for i := range tokens {
tokens[i] = strings.Title(strings.Trim(tokens[i], " ")) tokens[i] = strings.Title(strings.Trim(tokens[i], " "))
} }
return strings.Join(tokens, "") return strings.Join(tokens, "")
} }
@ -920,7 +921,7 @@ func isSQLBitType(t string) bool {
return t == "bit" return t == "bit"
} }
func isSQLStrangeType(t string) bool { func isSQLStrangeType(t string) bool {
return t == "interval" || t == "uuid" return t == "interval" || t == "uuid" || t == "json"
} }
// extractColSize extracts field size: e.g. varchar(255) => 255 // extractColSize extracts field size: e.g. varchar(255) => 255