WIP: Migrate to github.com/Ultraware/qb/v3

.github/workflows/ci.yml

@@ -15,16 +15,16 @@ jobs:
         with:
           go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         with:
-          version: v1.62.2
+          version: v2.10.1
 
   tests:
     needs: golangci-lint
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ 'oldstable', 'stable' ]
+        go-version: ["oldstable", "stable"]
 
     services:
       pgsql:
@@ -78,8 +78,8 @@ jobs:
 
       - name: Prepare MSSQL database
         run: |
-            cat internal/tests/scripts/sqlserver/create_database.sql | docker exec -i $(docker ps -alq) /opt/mssql-tools18/bin/sqlcmd -U sa -P 'P@ssw0rd' -C
-            cat internal/tests/scripts/sqlserver/create_login.sql | docker exec -i $(docker ps -alq) /opt/mssql-tools18/bin/sqlcmd -U sa -P 'P@ssw0rd' -C -d qb_test
+          cat internal/tests/scripts/sqlserver/create_database.sql | docker exec -i $(docker ps -alq) /opt/mssql-tools18/bin/sqlcmd -U sa -P 'P@ssw0rd' -C
+          cat internal/tests/scripts/sqlserver/create_login.sql | docker exec -i $(docker ps -alq) /opt/mssql-tools18/bin/sqlcmd -U sa -P 'P@ssw0rd' -C -d qb_test
 
       - name: Run unit tests
         run: make test

.golangci.yml

@@ -1,25 +1,16 @@
-run:
-  build-tags: []
-
-output:
-  print-issued-lines: true
-  print-linter-name: true
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
+    - err113
     - errcheck
     - errorlint
     - exhaustive
     - funlen
     - goconst
     - gocritic
     - gocyclo
-    - err113
-    - gofumpt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -28,51 +19,57 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
-
-linters-settings:
-  govet:
-    enable:
-      - shadow
-
-  gocyclo:
-    min-complexity: 15
-
-  lll:
-    line-length: 150
-    tab-width: 4
-
-  nakedret:
-    max-func-lines: 10
-
-  funlen:
-    lines: 120
-    statements: 60
-
+  settings:
+    funlen:
+      lines: 120
+      statements: 60
+    gocyclo:
+      min-complexity: 15
+    govet:
+      enable:
+        - shadow
+    lll:
+      line-length: 150
+      tab-width: 4
+    nakedret:
+      max-func-lines: 10
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - staticcheck
+        text: 'ST1000:'
+      - linters:
+          - dupl
+          - funlen
+          - lll
+        path: _test.go
+      - linters:
+          - revive
+        text: package-comments|exported
+      - linters:
+          - errcheck
+        source: defer .*Rollback()
+      - linters:
+          - errcheck
+        source: defer .*Close()
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude: []
-  exclude-rules:
-    - linters:
-        - stylecheck
-      text: "ST1000:"
-    - path: _test.go
-      linters:
-        - lll
-        - funlen
-        - dupl
-    - linters:
-        - revive
-      text: "package-comments|exported"
-    - linters:
-        - errcheck
-      source: "defer .*Rollback()"
-    - linters:
-        - errcheck
-      source: "defer .*Close()"
-  exclude-use-default: false
   max-same-issues: 0
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

README.md

@@ -11,7 +11,7 @@ qb is a library that allows you to build queries without using strings. This off
 ## Installation
 
 ```bash
-go get git.ultraware.nl/Ultraware/qb/v2/...
+go get github.com/Ultraware/qb/v3/...
 ```
 
 ## Quick start guide
@@ -239,4 +239,4 @@ func dbcond(f qb.Field) qb.Condition {
 ```golang
 q := one.Select(one.Field1).
 	Where(dbcond(one.Field1))
-```
+```

driver/autoqb/main.go

@@ -1,14 +1,14 @@
-package autoqb // import "git.ultraware.nl/Ultraware/qb/v2/driver/autoqb"
+package autoqb // import "github.com/Ultraware/qb/v3/driver/autoqb"
 
 import (
 	"database/sql"
 	"reflect"
 	"strings"
 
-	"git.ultraware.nl/Ultraware/qb/v2/driver/msqb"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/myqb"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/pgqb"
-	"git.ultraware.nl/Ultraware/qb/v2/qbdb"
+	"github.com/Ultraware/qb/v3/driver/msqb"
+	"github.com/Ultraware/qb/v3/driver/myqb"
+	"github.com/Ultraware/qb/v3/driver/pgqb"
+	"github.com/Ultraware/qb/v3/qbdb"
 )
 
 // New automatically selects a qb driver

driver/msqb/main.go

@@ -1,14 +1,14 @@
-package msqb // import "git.ultraware.nl/Ultraware/qb/v2/driver/msqb"
+package msqb // import "github.com/Ultraware/qb/v3/driver/msqb"
 
 import (
 	"database/sql"
 	"strconv"
 	"strings"
 
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/msqb/msqf"
-	"git.ultraware.nl/Ultraware/qb/v2/qbdb"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/driver/msqb/msqf"
+	"github.com/Ultraware/qb/v3/qbdb"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // Driver implements MSSQL-specific features

driver/msqb/msqf/functions.go

@@ -1,8 +1,8 @@
-package msqf // import "git.ultraware.nl/Ultraware/qb/v2/driver/msqb/msqf"
+package msqf // import "github.com/Ultraware/qb/v3/driver/msqb/msqf"
 
 import (
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // GetDate is a mssql-specific version of qf.Now

driver/myqb/main.go

@@ -1,14 +1,14 @@
-package myqb // import "git.ultraware.nl/Ultraware/qb/v2/driver/myqb"
+package myqb // import "github.com/Ultraware/qb/v3/driver/myqb"
 
 import (
 	"database/sql"
 	"strconv"
 	"strings"
 
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/myqb/myqf"
-	"git.ultraware.nl/Ultraware/qb/v2/qbdb"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/driver/myqb/myqf"
+	"github.com/Ultraware/qb/v3/qbdb"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // Driver implements PostgreSQL-specific features

driver/myqb/myqf/functions.go

@@ -1,8 +1,8 @@
-package myqf // import "git.ultraware.nl/Ultraware/qb/v2/driver/myqb/myqf"
+package myqf // import "github.com/Ultraware/qb/v3/driver/myqb/myqf"
 
 import (
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // Values is a mysql-specific version of qf.Excluded

driver/pgqb/main.go

@@ -1,16 +1,16 @@
-package pgqb // import "git.ultraware.nl/Ultraware/qb/v2/driver/pgqb"
+package pgqb // import "github.com/Ultraware/qb/v3/driver/pgqb"
 
 import (
 	"database/sql"
 	"strconv"
 	"strings"
 
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/pgqb/pgqc"
-	"git.ultraware.nl/Ultraware/qb/v2/driver/pgqb/pgqf"
-	"git.ultraware.nl/Ultraware/qb/v2/qbdb"
-	"git.ultraware.nl/Ultraware/qb/v2/qc"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/driver/pgqb/pgqc"
+	"github.com/Ultraware/qb/v3/driver/pgqb/pgqf"
+	"github.com/Ultraware/qb/v3/qbdb"
+	"github.com/Ultraware/qb/v3/qc"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // Driver implements PostgreSQL-specific features

driver/pgqb/pgqc/conditions.go

@@ -1,8 +1,8 @@
-package pgqc // import "git.ultraware.nl/Ultraware/qb/v2/driver/pgqb/pgqc"
+package pgqc // import "github.com/Ultraware/qb/v3/driver/pgqb/pgqc"
 
 import (
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/qc"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/qc"
 )
 
 // ILike is a postgres-specific version of qc.Like

driver/pgqb/pgqf/functions.go

@@ -1,8 +1,8 @@
-package pgqf // import "git.ultraware.nl/Ultraware/qb/v2/driver/pgqb/pgqf"
+package pgqf // import "github.com/Ultraware/qb/v3/driver/pgqb/pgqf"
 
 import (
-	"git.ultraware.nl/Ultraware/qb/v2"
-	"git.ultraware.nl/Ultraware/qb/v2/qf"
+	"github.com/Ultraware/qb/v3"
+	"github.com/Ultraware/qb/v3/qf"
 )
 
 // Excluded is a postgres-specific version of qf.Excluded

go.mod

@@ -1,20 +1,21 @@
-module git.ultraware.nl/Ultraware/qb/v2
+module github.com/Ultraware/qb/v3
 
-go 1.23.0
+go 1.25.7
 
 require (
 	git.fuyu.moe/Fuyu/assert v0.2.1
 	github.com/go-sql-driver/mysql v1.9.3
-	github.com/lib/pq v1.10.9
-	github.com/microsoft/go-mssqldb v1.8.2
+	github.com/lib/pq v1.12.3
+	github.com/microsoft/go-mssqldb v1.9.8
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
+	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	golang.org/x/crypto v0.50.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
 )