Skip to content

Commit a26e035

Browse files
committed
[dev] refacoring
1 parent b62f403 commit a26e035

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

postgresql.go

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,27 @@ func (m *PostgreSQL) Mark() string {
2121

2222
func (m *PostgreSQL) IsJSON(v string) (string, bool) {
2323
//table.json:field.name:type
24-
var table, field, name, tp string
24+
var table, field, name string
25+
var meta []string
26+
tp := "text"
2527

2628
parts := strings.SplitN(v, ".", 3)
2729
if len(parts) == 2 && strings.HasPrefix(parts[0], "json:") {
2830
// [0]:json:field, [1]:name:type
2931
field = parts[0][5:]
30-
i := strings.Index(parts[1], ":")
31-
if i > 0 {
32-
name = parts[1][:i]
33-
tp = parts[1][i+1:]
34-
} else {
35-
name = parts[1]
36-
}
32+
meta = strings.SplitN(parts[1], ":", 2)
3733
} else if len(parts) == 3 && strings.HasPrefix(parts[1], "json:") {
3834
// [0]:table, [1]:json:field, [2]:name:type
3935
table = parts[0]
4036
field = parts[1][5:]
41-
i := strings.Index(parts[2], ":")
42-
if i > 0 {
43-
name = parts[2][:i]
44-
tp = parts[2][i+1:]
45-
} else {
46-
name = parts[2]
47-
}
37+
meta = strings.SplitN(parts[2], ":", 2)
4838
} else {
4939
return v, false
5040
}
41+
name = meta[0]
42+
if len(meta) == 2 {
43+
tp = meta[1]
44+
}
5145

5246
var s, e string
5347
if tp == "date" {

0 commit comments

Comments
 (0)