tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Jinzhu 2018-07-27 07:21:04 +08:00 committed by GitHub
commit 53d5c9df19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dialects/postgres/postgres.go
View File

@ -4,11 +4,11 @@ import (
"database/sql" "database/sql"
"database/sql/driver" "database/sql/driver"
_ "github.com/lib/pq"
"github.com/lib/pq/hstore"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
_ "github.com/lib/pq"
"github.com/lib/pq/hstore"
) )
type Hstore map[string]*string type Hstore map[string]*string

8
utils.go
View File

@ -80,14 +80,16 @@ func ToDBName(name string) string {
var ( var (
value = commonInitialismsReplacer.Replace(name) value = commonInitialismsReplacer.Replace(name)
buf = bytes.NewBufferString("") buf = bytes.NewBufferString("")
lastCase, currCase, nextCase strCase lastCase, currCase, nextCase, nextNumber strCase
) )
for i, v := range value[:len(value)-1] { for i, v := range value[:len(value)-1] {
nextCase = strCase(value[i+1] >= 'A' && value[i+1] <= 'Z') nextCase = strCase(value[i+1] >= 'A' && value[i+1] <= 'Z')
nextNumber = strCase(value[i+1] >= '0' && value[i+1] <= '9')
if i > 0 { if i > 0 {
if currCase == upper { if currCase == upper {
if lastCase == upper && nextCase == upper { if lastCase == upper && (nextCase == upper || nextNumber == upper) {
buf.WriteRune(v) buf.WriteRune(v)
} else { } else {
if value[i-1] != '_' && value[i+1] != '_' { if value[i-1] != '_' && value[i+1] != '_' {
@ -97,7 +99,7 @@ func ToDBName(name string) string {
} }
} else { } else {
buf.WriteRune(v) buf.WriteRune(v)
if i == len(value)-2 && nextCase == upper { if i == len(value)-2 && (nextCase == upper && nextNumber == lower) {
buf.WriteRune('_') buf.WriteRune('_')
} }
} }

3
utils_test.go
View File

@ -15,6 +15,9 @@ func TestToDBNameGenerateFriendlyName(t *testing.T) {
"AbcAndJkl": "abc_and_jkl", "AbcAndJkl": "abc_and_jkl",
"EmployeeID": "employee_id", "EmployeeID": "employee_id",
"SKU_ID": "sku_id", "SKU_ID": "sku_id",
"UTF8": "utf8",
"Level1": "level1",
"SHA256Hash": "sha256_hash",
"FieldX": "field_x", "FieldX": "field_x",
"HTTPAndSMTP": "http_and_smtp", "HTTPAndSMTP": "http_and_smtp",
"HTTPServerHandlerForURLID": "http_server_handler_for_url_id", "HTTPServerHandlerForURLID": "http_server_handler_for_url_id",