Merge pull request #5 from bramca/master

fix faulty or clause

Author: survivorbat

.github/workflows/test.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.23' ]
+        go-version: [ '1.24' ]
     steps:
       - uses: actions/checkout@v3
 
@@ -21,7 +21,7 @@ jobs:
         run: go test -json > TestResults-${{ matrix.go-version }}.json
 
       - name: Upload Go test results for ${{ matrix.go-version }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Go-results-${{ matrix.go-version }}
           path: TestResults-${{ matrix.go-version }}.json

.golangci.yaml

@@ -1,86 +1,58 @@
-linters-settings:
-  gocritic:
-    disabled-checks:
-      - "paramTypeCombine"
-    enabled-tags:
-      - "performance"
-      - "style"
-      - "diagnostic"
+version: "2"
 linters:
+  default: all
+  disable:
+    - depguard
+    - exhaustruct
+    - funlen
+    - gochecknoglobals
+    - godot
+    - godox
+    - lll
+    - testpackage
+    - varnamelen
+    - wrapcheck
+    - wsl
+  settings:
+    gocritic:
+      disabled-checks:
+        - paramTypeCombine
+        - unnamedResult
+      enabled-tags:
+        - performance
+        - style
+        - diagnostic
+    govet:
+      disable:
+        - fieldalignment
+      enable-all: true
+    nlreturn:
+      block-size: 3
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - err113
+          - goconst
+        path: (.+)_test.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
   enable:
-    - asasalint
-    - asciicheck
-    - bidichk
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - cyclop
-    - decorder
-    - dogsled
-    - dupword
-    - durationcheck
-    - errcheck
-    - errname
-    - errorlint
-    - execinquery
-    - exhaustive
-    - exportloopref
-    - forbidigo
-    - ginkgolinter
-    - gocheckcompilerdirectives
-    - gochecknoinits
-    - gocognit
-    - goconst
-    - gocritic
-    - gocyclo
-    - goerr113
+    - gci
     - gofmt
     - gofumpt
-    - goheader
     - goimports
-    - gomoddirectives
-    - gomodguard
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - gosmopolitan
-    - govet
-    - grouper
-    - ifshort
-    - importas
-    - ineffassign
-    - interfacebloat
-    - interfacer
-    - ireturn
-    - loggercheck
-    - maintidx
-    - makezero
-    - mirror
-    - misspell
-    - musttag
-    - nakedret
-    - nestif
-    - nilerr
-    - nilnil
-    - nlreturn
-    - nonamedreturns
-    - nosprintfhostport
-    - paralleltest
-    - prealloc
-    - predeclared
-    - promlinter
-    - reassign
-    - rowserrcheck
-    - sqlclosecheck
-    - staticcheck
-    - tenv
-    - thelper
-    - tparallel
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - usestdlibvars
-    - wastedassign
-    - whitespace
-    - zerologlint
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

examples_test.go

@@ -1,13 +1,12 @@
 module github.com/survivorbat/gorm-like
 
-go 1.23.1
+go 1.24.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.25.12
+	gorm.io/gorm v1.26.0
 )
 
 require (
@@ -17,6 +16,7 @@ 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
+	golang.org/x/text v0.24.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/sqlite v1.4.3 // indirect
 )

go.mod

@@ -26,8 +26,8 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 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=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 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=
@@ -37,5 +37,5 @@ 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.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
-gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+gorm.io/gorm v1.26.0 h1:9lqQVPG5aNNS6AyHdRiwScAVnXHg/L/Srzx55G5fOgs=
+gorm.io/gorm v1.26.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=

go.sum

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ing-bank/gormtestutil"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDeepGorm_Name_ReturnsExpectedName(t *testing.T) {
@@ -29,6 +30,6 @@ func TestDeepGorm_Initialize_RegistersCallback(t *testing.T) {
 	err := plugin.Initialize(db)
 
 	// Assert
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotNil(t, db.Callback().Query().Get("gormlike:query"))
 }

plugin_test.go

@@ -10,6 +10,7 @@ import (
 
 const tagName = "gormlike"
 
+//nolint:gocognit,cyclop // is a complex, recursive function
 func (d *gormLike) replaceExpressions(db *gorm.DB, expressions []clause.Expression) []clause.Expression {
 	for index, cond := range expressions {
 		switch cond := cond.(type) {
@@ -49,8 +50,8 @@ func (d *gormLike) replaceExpressions(db *gorm.DB, expressions []clause.Expressi
 				continue
 			}
 
-			// 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)) {
+			// If there are no % AND there aren't only replaceable characters, just skip it because it's a normal query
+			if !strings.Contains(value, "%") && (d.replaceCharacter == "" || !strings.Contains(value, d.replaceCharacter)) {
 				continue
 			}
 
@@ -89,14 +90,14 @@ func (d *gormLike) replaceExpressions(db *gorm.DB, expressions []clause.Expressi
 			query := db.Session(&gorm.Session{NewDB: true})
 
 			for _, value := range cond.Values {
-				value, ok := value.(string)
-				if !ok {
+				value, valueOk := value.(string)
+				if !valueOk {
 					continue
 				}
 
 				condition := fmt.Sprintf("%s = ?", cond.Column)
 
-				// If there are no % AND there aren't ony replaceable characters, just skip it because it's a normal query
+				// If there are no % AND there aren't only 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("CAST(%s as varchar) LIKE ?", cond.Column)
 
@@ -115,14 +116,22 @@ func (d *gormLike) replaceExpressions(db *gorm.DB, expressions []clause.Expressi
 				continue
 			}
 
+			whereExpression, ok := query.Statement.Clauses["WHERE"].Expression.(clause.Where)
+
+			if ok {
+				expressions[index] = whereExpression
+			}
+
 			// 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
+			if len(whereExpression.Exprs) > 1 {
+				var newExpression clause.OrConditions
+				newExpression.Exprs = whereExpression.Exprs
 
-			expressions[index] = newExpression
+				expressions[index] = newExpression
+			}
 		}
 	}