@@ -10,27 +10,17 @@ import (
1010
1111const tagName = "gormlike"
1212
13- //nolint:gocognit,cyclop // Acceptable
14- func (d * gormLike ) queryCallback (db * gorm.DB ) {
15- // If we only want to like queries that are explicitly set to true, we back out early if anything's amiss
16- settingValue , settingOk := db .Get (tagName )
17- if d .conditionalSetting && ! settingOk {
18- return
19- }
20-
21- if settingOk {
22- if boolValue , _ := settingValue .(bool ); ! boolValue {
23- return
24- }
25- }
26-
27- exp , settingOk := db .Statement .Clauses ["WHERE" ].Expression .(clause.Where )
28- if ! settingOk {
29- return
30- }
31-
32- for index , cond := range exp .Exprs {
13+ func (d * gormLike ) replaceExpressions (db * gorm.DB , expressions []clause.Expression ) []clause.Expression {
14+ for index , cond := range expressions {
3315 switch cond := cond .(type ) {
16+ case clause.AndConditions :
17+ // Recursively go through the expressions of AndConditions
18+ cond .Exprs = d .replaceExpressions (db , cond .Exprs )
19+ expressions [index ] = cond
20+ case clause.OrConditions :
21+ // Recursively go through the expressions of OrConditions
22+ cond .Exprs = d .replaceExpressions (db , cond .Exprs )
23+ expressions [index ] = cond
3424 case clause.Eq :
3525 columnName , columnOk := cond .Column .(string )
3626 if ! columnOk {
@@ -64,13 +54,13 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
6454 continue
6555 }
6656
67- condition := fmt .Sprintf ("%s LIKE ?" , cond .Column )
57+ condition := fmt .Sprintf ("CAST(%s as varchar) LIKE ?" , cond .Column )
6858
6959 if d .replaceCharacter != "" {
7060 value = strings .ReplaceAll (value , d .replaceCharacter , "%" )
7161 }
7262
73- exp . Exprs [index ] = db .Session (& gorm.Session {NewDB : true }).Where (condition , value ).Statement .Clauses ["WHERE" ].Expression
63+ expressions [index ] = db .Session (& gorm.Session {NewDB : true }).Where (condition , value ).Statement .Clauses ["WHERE" ].Expression
7464 case clause.IN :
7565 columnName , columnOk := cond .Column .(string )
7666 if ! columnOk {
@@ -95,7 +85,6 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
9585 }
9686
9787 var likeCounter int
98- var useOr bool
9988
10089 query := db .Session (& gorm.Session {NewDB : true })
10190
@@ -109,7 +98,7 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
10998
11099 // If there are no % AND there aren't ony replaceable characters, just skip it because it's a normal query
111100 if strings .Contains (value , "%" ) || (d .replaceCharacter != "" && strings .Contains (value , d .replaceCharacter )) {
112- condition = fmt .Sprintf ("%s LIKE ?" , cond .Column )
101+ condition = fmt .Sprintf ("CAST(%s as varchar) LIKE ?" , cond .Column )
113102
114103 if d .replaceCharacter != "" {
115104 value = strings .ReplaceAll (value , d .replaceCharacter , "%" )
@@ -118,22 +107,45 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
118107 likeCounter ++
119108 }
120109
121- if useOr {
122- query = query .Or (condition , value )
123-
124- continue
125- }
126-
127- query = query .Where (condition , value )
128- useOr = true
110+ query = query .Or (condition , value )
129111 }
130112
131113 // Don't alter the query if it isn't necessary
132114 if likeCounter == 0 {
133115 continue
134116 }
135117
136- exp .Exprs [index ] = db .Session (& gorm.Session {NewDB : true }).Where (query ).Statement .Clauses ["WHERE" ].Expression
118+ // This feels a bit like a dirty hack
119+ // but otherwise the generated query would not be correct in case of an AND condition between multiple OR conditions
120+ // e.g. without this -> x = .. OR x = .. AND y = .. OR y = .. (no brackets around the OR conditions mess up the query)
121+ // e.g. with this -> (x = .. OR x = ..) AND (y = .. OR y = ..)
122+ var newExpression clause.OrConditions
123+ newExpression .Exprs = query .Statement .Clauses ["WHERE" ].Expression .(clause.Where ).Exprs
124+
125+ expressions [index ] = newExpression
126+ }
127+ }
128+
129+ return expressions
130+ }
131+
132+ func (d * gormLike ) queryCallback (db * gorm.DB ) {
133+ // If we only want to like queries that are explicitly set to true, we back out early if anything's amiss
134+ settingValue , settingOk := db .Get (tagName )
135+ if d .conditionalSetting && ! settingOk {
136+ return
137+ }
138+
139+ if settingOk {
140+ if boolValue , _ := settingValue .(bool ); ! boolValue {
141+ return
137142 }
138143 }
144+
145+ exp , settingOk := db .Statement .Clauses ["WHERE" ].Expression .(clause.Where )
146+ if ! settingOk {
147+ return
148+ }
149+
150+ exp .Exprs = d .replaceExpressions (db , exp .Exprs )
139151}
0 commit comments