Skip to content

Commit ec8403e

Browse files
authored
Fix: enhance driver handling and improve query formatting (#284)
1 parent f857863 commit ec8403e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/config/gormdb/gorm.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ func (e *Database) Init() {
104104
e.Registers[i].Replicas[j] = pkg.ParseEnvTemplate(e.Registers[i].Replicas[j])
105105
}
106106
}
107+
switch e.Driver {
108+
case gorms.Postgres:
109+
gorms.Driver = gorms.Postgres
110+
case gorms.Mysql:
111+
gorms.Driver = gorms.Mysql
112+
case gorms.Dm:
113+
gorms.Driver = gorms.Dm
114+
}
107115

108116
registers := make([]ResolverConfigure, len(e.Registers))
109117
for i := range e.Registers {

pkg/search/gorms/query.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ func parseSQL(driver string, searchTag *resolveSearchTag, condition Condition, q
7575
if driver == Postgres {
7676
iStr = "i"
7777
}
78+
column := fmt.Sprintf("%s%s%s", sep, searchTag.Column, sep)
7879
if searchTag.Table != "" {
7980
searchTag.Table = fmt.Sprintf("%s%s%s.", sep, searchTag.Table, sep)
81+
column = searchTag.Table + column
8082
}
81-
column := fmt.Sprintf("%s%s%s", sep, searchTag.Column, sep)
8283
switch searchTag.Type {
8384
case "left":
8485
//左关联

0 commit comments

Comments
 (0)