Merge pull request #4 from bramca/master

Update gorm version and fix wildcards on non strings

.github/workflows/test.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.18', '1.19' ]
+        go-version: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
 
@@ -24,4 +24,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Go-results-${{ matrix.go-version }}
-          path: TestResults-${{ matrix.go-version }}.json
+          path: TestResults-${{ matrix.go-version }}.json

go.mod

@@ -1,13 +1,13 @@
 module github.com/survivorbat/gorm-like
 
-go 1.20
+go 1.23.1
 
 require (
 	github.com/google/uuid v1.3.0
 	github.com/ing-bank/gormtestutil v0.0.0
 	github.com/stretchr/testify v1.8.0
 	gorm.io/driver/sqlite v1.4.3
-	gorm.io/gorm v1.24.2
+	gorm.io/gorm v1.25.12
 )
 
 require (
@@ -17,5 +17,6 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-sqlite3 v1.14.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -12,25 +12,30 @@ github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
 gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
 gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.24.2 h1:9wR6CFD+G8nOusLdvkZelOEhpJVwwHzpQOUM+REd6U0=
-gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

query.go

@@ -10,27 +10,17 @@ import (
 
 const tagName = "gormlike"
 
-//nolint:gocognit,cyclop // Acceptable
-func (d *gormLike) queryCallback(db *gorm.DB) {
-	// If we only want to like queries that are explicitly set to true, we back out early if anything's amiss
-	settingValue, settingOk := db.Get(tagName)
-	if d.conditionalSetting && !settingOk {
-		return
-	}
-
-	if settingOk {
-		if boolValue, _ := settingValue.(bool); !boolValue {
-			return
-		}
-	}
-
-	exp, settingOk := db.Statement.Clauses["WHERE"].Expression.(clause.Where)
-	if !settingOk {
-		return
-	}
-
-	for index, cond := range exp.Exprs {
+func (d *gormLike) replaceExpressions(db *gorm.DB, expressions []clause.Expression) []clause.Expression {
+	for index, cond := range expressions {
 		switch cond := cond.(type) {
+		case clause.AndConditions:
+			// Recursively go through the expressions of AndConditions
+			cond.Exprs = d.replaceExpressions(db, cond.Exprs)
+			expressions[index] = cond
+		case clause.OrConditions:
+			// Recursively go through the expressions of OrConditions
+			cond.Exprs = d.replaceExpressions(db, cond.Exprs)
+			expressions[index] = cond
 		case clause.Eq:
 			columnName, columnOk := cond.Column.(string)
 			if !columnOk {
@@ -64,13 +54,13 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
 				continue
 			}
 
-			condition := fmt.Sprintf("%s LIKE ?", cond.Column)
+			condition := fmt.Sprintf("CAST(%s as varchar) LIKE ?", cond.Column)
 
 			if d.replaceCharacter != "" {
 				value = strings.ReplaceAll(value, d.replaceCharacter, "%")
 			}
 
-			exp.Exprs[index] = db.Session(&gorm.Session{NewDB: true}).Where(condition, value).Statement.Clauses["WHERE"].Expression
+			expressions[index] = db.Session(&gorm.Session{NewDB: true}).Where(condition, value).Statement.Clauses["WHERE"].Expression
 		case clause.IN:
 			columnName, columnOk := cond.Column.(string)
 			if !columnOk {
@@ -95,7 +85,6 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
 			}
 
 			var likeCounter int
-			var useOr bool
 
 			query := db.Session(&gorm.Session{NewDB: true})
 
@@ -109,7 +98,7 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
 
 				// If there are no % AND there aren't ony replaceable characters, just skip it because it's a normal query
 				if strings.Contains(value, "%") || (d.replaceCharacter != "" && strings.Contains(value, d.replaceCharacter)) {
-					condition = fmt.Sprintf("%s LIKE ?", cond.Column)
+					condition = fmt.Sprintf("CAST(%s as varchar) LIKE ?", cond.Column)
 
 					if d.replaceCharacter != "" {
 						value = strings.ReplaceAll(value, d.replaceCharacter, "%")
@@ -118,22 +107,45 @@ func (d *gormLike) queryCallback(db *gorm.DB) {
 					likeCounter++
 				}
 
-				if useOr {
-					query = query.Or(condition, value)
-
-					continue
-				}
-
-				query = query.Where(condition, value)
-				useOr = true
+				query = query.Or(condition, value)
 			}
 
 			// Don't alter the query if it isn't necessary
 			if likeCounter == 0 {
 				continue
 			}
 
-			exp.Exprs[index] = db.Session(&gorm.Session{NewDB: true}).Where(query).Statement.Clauses["WHERE"].Expression
+			// This feels a bit like a dirty hack
+			// but otherwise the generated query would not be correct in case of an AND condition between multiple OR conditions
+			// e.g. without this -> x = .. OR x = .. AND y = .. OR y = .. (no brackets around the OR conditions mess up the query)
+			// e.g. with this -> (x = .. OR x = ..) AND (y = .. OR y = ..)
+			var newExpression clause.OrConditions
+			newExpression.Exprs = query.Statement.Clauses["WHERE"].Expression.(clause.Where).Exprs
+
+			expressions[index] = newExpression
+		}
+	}
+
+	return expressions
+}
+
+func (d *gormLike) queryCallback(db *gorm.DB) {
+	// If we only want to like queries that are explicitly set to true, we back out early if anything's amiss
+	settingValue, settingOk := db.Get(tagName)
+	if d.conditionalSetting && !settingOk {
+		return
+	}
+
+	if settingOk {
+		if boolValue, _ := settingValue.(bool); !boolValue {
+			return
 		}
 	}
+
+	exp, settingOk := db.Statement.Clauses["WHERE"].Expression.(clause.Where)
+	if !settingOk {
+		return
+	}
+
+	exp.Exprs = d.replaceExpressions(db, exp.Exprs)
 }