From 976d5feb431380313e7e87afa832772751809f5a Mon Sep 17 00:00:00 2001 From: Robin Knaapen Date: Tue, 21 Apr 2026 17:15:04 +0200 Subject: [PATCH 1/4] Migrate to github.com/Ultraware/qb/v3 --- README.md | 4 ++-- driver/autoqb/main.go | 10 +++++----- driver/msqb/main.go | 10 +++++----- driver/msqb/msqf/functions.go | 6 +++--- driver/myqb/main.go | 10 +++++----- driver/myqb/myqf/functions.go | 6 +++--- driver/pgqb/main.go | 14 +++++++------- driver/pgqb/pgqc/conditions.go | 6 +++--- driver/pgqb/pgqf/functions.go | 6 +++--- go.mod | 2 +- internal/tests/internal/model/tables.go | 2 +- internal/tests/tests_test.go | 14 +++++++------- .../internal/db/msarchitect/msarchitect.go | 16 ++++++++-------- .../internal/db/msarchitect/msmodel/tables.go | 2 +- .../internal/db/myarchitect/myarchitect.go | 16 ++++++++-------- .../internal/db/myarchitect/mymodel/tables.go | 2 +- .../internal/db/pgarchitect/pgarchitect.go | 16 ++++++++-------- .../internal/db/pgarchitect/pgmodel/tables.go | 2 +- qb-architect/main.go | 12 ++++++------ qb-architect/types.go | 2 +- qb-generator/main.go | 6 +++--- qb-generator/main_test.go | 2 +- qb.go | 2 +- qbdb/driver.go | 2 +- qbdb/driver_test.go | 2 +- qbdb/main.go | 4 ++-- qbdb/types.go | 2 +- qc/condition.go | 4 ++-- qc/condition_test.go | 6 +++--- qc/helper.go | 2 +- qf/case.go | 2 +- qf/case_test.go | 4 ++-- qf/field.go | 2 +- qf/functions.go | 4 ++-- qf/functions_test.go | 6 +++--- sql_test.go | 2 +- 36 files changed, 105 insertions(+), 105 deletions(-) diff --git a/README.md b/README.md index 4a6509e..747e07d 100644 --- a/README.md +++ b/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)) -``` \ No newline at end of file +``` diff --git a/driver/autoqb/main.go b/driver/autoqb/main.go index a60c346..5a946a5 100644 --- a/driver/autoqb/main.go +++ b/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 diff --git a/driver/msqb/main.go b/driver/msqb/main.go index 8dfb0d4..36bdb4e 100644 --- a/driver/msqb/main.go +++ b/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 diff --git a/driver/msqb/msqf/functions.go b/driver/msqb/msqf/functions.go index e904e78..ba53b22 100644 --- a/driver/msqb/msqf/functions.go +++ b/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 diff --git a/driver/myqb/main.go b/driver/myqb/main.go index d8ff941..2ad159e 100644 --- a/driver/myqb/main.go +++ b/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 diff --git a/driver/myqb/myqf/functions.go b/driver/myqb/myqf/functions.go index c7f896c..67cb988 100644 --- a/driver/myqb/myqf/functions.go +++ b/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 diff --git a/driver/pgqb/main.go b/driver/pgqb/main.go index a00c689..3440382 100644 --- a/driver/pgqb/main.go +++ b/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 diff --git a/driver/pgqb/pgqc/conditions.go b/driver/pgqb/pgqc/conditions.go index 04fbce8..4d56c96 100644 --- a/driver/pgqb/pgqc/conditions.go +++ b/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 diff --git a/driver/pgqb/pgqf/functions.go b/driver/pgqb/pgqf/functions.go index 3508e74..869bfb0 100644 --- a/driver/pgqb/pgqf/functions.go +++ b/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 diff --git a/go.mod b/go.mod index da7be89..64e2e40 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.ultraware.nl/Ultraware/qb/v2 +module github.com/Ultraware/qb/v3 go 1.23.0 diff --git a/internal/tests/internal/model/tables.go b/internal/tests/internal/model/tables.go index f9c05b1..4116711 100644 --- a/internal/tests/internal/model/tables.go +++ b/internal/tests/internal/model/tables.go @@ -2,7 +2,7 @@ package model -import "git.ultraware.nl/Ultraware/qb/v2" +import "github.com/Ultraware/qb/v3" ///// One ///// var ( diff --git a/internal/tests/tests_test.go b/internal/tests/tests_test.go index 620b480..8813252 100644 --- a/internal/tests/tests_test.go +++ b/internal/tests/tests_test.go @@ -9,13 +9,13 @@ import ( "time" "git.fuyu.moe/Fuyu/assert" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/driver/autoqb" - "git.ultraware.nl/Ultraware/qb/v2/internal/tests/internal/model" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" - "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/autoqb" + "github.com/Ultraware/qb/v3/internal/tests/internal/model" + "github.com/Ultraware/qb/v3/internal/testutil" + "github.com/Ultraware/qb/v3/qbdb" + "github.com/Ultraware/qb/v3/qc" + "github.com/Ultraware/qb/v3/qf" ) var ( diff --git a/qb-architect/internal/db/msarchitect/msarchitect.go b/qb-architect/internal/db/msarchitect/msarchitect.go index 3511d90..49c007f 100644 --- a/qb-architect/internal/db/msarchitect/msarchitect.go +++ b/qb-architect/internal/db/msarchitect/msarchitect.go @@ -4,14 +4,14 @@ import ( "database/sql" "strings" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/driver/msqb" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/msarchitect/msmodel" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/util" - "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/msqb" + "github.com/Ultraware/qb/v3/qb-architect/internal/db" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/msarchitect/msmodel" + "github.com/Ultraware/qb/v3/qb-architect/internal/util" + "github.com/Ultraware/qb/v3/qbdb" + "github.com/Ultraware/qb/v3/qc" + "github.com/Ultraware/qb/v3/qf" // mssql driver _ "github.com/microsoft/go-mssqldb" // database driver for Microsoft MSSQL diff --git a/qb-architect/internal/db/msarchitect/msmodel/tables.go b/qb-architect/internal/db/msarchitect/msmodel/tables.go index 53de04b..0306782 100644 --- a/qb-architect/internal/db/msarchitect/msmodel/tables.go +++ b/qb-architect/internal/db/msarchitect/msmodel/tables.go @@ -2,7 +2,7 @@ package msmodel -import "git.ultraware.nl/Ultraware/qb/v2" +import "github.com/Ultraware/qb/v3" ///// Tables ///// var ( diff --git a/qb-architect/internal/db/myarchitect/myarchitect.go b/qb-architect/internal/db/myarchitect/myarchitect.go index e09aaef..6d40882 100644 --- a/qb-architect/internal/db/myarchitect/myarchitect.go +++ b/qb-architect/internal/db/myarchitect/myarchitect.go @@ -3,14 +3,14 @@ package myarchitect import ( "database/sql" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/driver/myqb" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/myarchitect/mymodel" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/util" - "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/myqb" + "github.com/Ultraware/qb/v3/qb-architect/internal/db" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/myarchitect/mymodel" + "github.com/Ultraware/qb/v3/qb-architect/internal/util" + "github.com/Ultraware/qb/v3/qbdb" + "github.com/Ultraware/qb/v3/qc" + "github.com/Ultraware/qb/v3/qf" // mysql driver _ "github.com/go-sql-driver/mysql" diff --git a/qb-architect/internal/db/myarchitect/mymodel/tables.go b/qb-architect/internal/db/myarchitect/mymodel/tables.go index 21f64ba..7f984cd 100644 --- a/qb-architect/internal/db/myarchitect/mymodel/tables.go +++ b/qb-architect/internal/db/myarchitect/mymodel/tables.go @@ -2,7 +2,7 @@ package mymodel -import "git.ultraware.nl/Ultraware/qb/v2" +import "github.com/Ultraware/qb/v3" ///// Tables ///// var ( diff --git a/qb-architect/internal/db/pgarchitect/pgarchitect.go b/qb-architect/internal/db/pgarchitect/pgarchitect.go index 80add89..def8397 100644 --- a/qb-architect/internal/db/pgarchitect/pgarchitect.go +++ b/qb-architect/internal/db/pgarchitect/pgarchitect.go @@ -4,14 +4,14 @@ import ( "database/sql" "strings" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/driver/pgqb" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/pgarchitect/pgmodel" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/util" - "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" + "github.com/Ultraware/qb/v3/qb-architect/internal/db" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/pgarchitect/pgmodel" + "github.com/Ultraware/qb/v3/qb-architect/internal/util" + "github.com/Ultraware/qb/v3/qbdb" + "github.com/Ultraware/qb/v3/qc" + "github.com/Ultraware/qb/v3/qf" // pgsql driver _ "github.com/lib/pq" diff --git a/qb-architect/internal/db/pgarchitect/pgmodel/tables.go b/qb-architect/internal/db/pgarchitect/pgmodel/tables.go index 437394e..272363c 100644 --- a/qb-architect/internal/db/pgarchitect/pgmodel/tables.go +++ b/qb-architect/internal/db/pgarchitect/pgmodel/tables.go @@ -2,7 +2,7 @@ package pgmodel -import "git.ultraware.nl/Ultraware/qb/v2" +import "github.com/Ultraware/qb/v3" ///// PgAttribute ///// var ( diff --git a/qb-architect/main.go b/qb-architect/main.go index b60be46..91fb109 100644 --- a/qb-architect/main.go +++ b/qb-architect/main.go @@ -1,4 +1,4 @@ -package main // import "git.ultraware.nl/Ultraware/qb/v2/qb-architect" +package main // import "github.com/Ultraware/qb/v3/qb-architect" import ( "encoding/json" @@ -9,11 +9,11 @@ import ( "sort" "strings" - "git.ultraware.nl/Ultraware/qb/v2/internal/filter" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/msarchitect" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/myarchitect" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db/pgarchitect" + "github.com/Ultraware/qb/v3/internal/filter" + "github.com/Ultraware/qb/v3/qb-architect/internal/db" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/msarchitect" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/myarchitect" + "github.com/Ultraware/qb/v3/qb-architect/internal/db/pgarchitect" ) var ( diff --git a/qb-architect/types.go b/qb-architect/types.go index b796d9b..52130c0 100644 --- a/qb-architect/types.go +++ b/qb-architect/types.go @@ -3,7 +3,7 @@ package main import ( "sort" - "git.ultraware.nl/Ultraware/qb/v2/qb-architect/internal/db" + "github.com/Ultraware/qb/v3/qb-architect/internal/db" ) type fields []db.Field diff --git a/qb-generator/main.go b/qb-generator/main.go index b114287..9cf21b2 100644 --- a/qb-generator/main.go +++ b/qb-generator/main.go @@ -1,4 +1,4 @@ -package main // import "git.ultraware.nl/Ultraware/qb/v2/qb-generator" +package main // import "github.com/Ultraware/qb/v3/qb-generator" import ( "encoding/json" @@ -11,7 +11,7 @@ import ( "strings" "text/template" - "git.ultraware.nl/Ultraware/qb/v2/internal/filter" + "github.com/Ultraware/qb/v3/internal/filter" ) type inputTable struct { @@ -240,7 +240,7 @@ func generateCode(out io.Writer, input []inputTable) error { _, _ = io.WriteString(out, "// Code generated by qb-generator; DO NOT EDIT.\n\n") _, _ = io.WriteString(out, `package `+pkg+"\n\n") - _, _ = io.WriteString(out, `import "git.ultraware.nl/Ultraware/qb/v2"`+"\n\n") + _, _ = io.WriteString(out, `import "github.com/Ultraware/qb/v3"`+"\n\n") for _, v := range tables { if err := t.Execute(out, v); err != nil { diff --git a/qb-generator/main_test.go b/qb-generator/main_test.go index 86804d6..c030f8d 100644 --- a/qb-generator/main_test.go +++ b/qb-generator/main_test.go @@ -5,7 +5,7 @@ import ( "testing" "git.fuyu.moe/Fuyu/assert" - "git.ultraware.nl/Ultraware/qb/v2/internal/filter" + "github.com/Ultraware/qb/v3/internal/filter" ) func expectCleanName(input, expected string) func(*testing.T) { diff --git a/qb.go b/qb.go index 4a24e21..365d376 100644 --- a/qb.go +++ b/qb.go @@ -1 +1 @@ -package qb // import "git.ultraware.nl/Ultraware/qb/v2" +package qb // import "github.com/Ultraware/qb/v3" diff --git a/qbdb/driver.go b/qbdb/driver.go index d141206..df57c69 100644 --- a/qbdb/driver.go +++ b/qbdb/driver.go @@ -3,7 +3,7 @@ package qbdb import ( "strconv" - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) // Driver is a default driver used for tests diff --git a/qbdb/driver_test.go b/qbdb/driver_test.go index 01610b3..d1feb00 100644 --- a/qbdb/driver_test.go +++ b/qbdb/driver_test.go @@ -4,7 +4,7 @@ import ( "database/sql/driver" "testing" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" + "github.com/Ultraware/qb/v3/internal/testutil" ) var database = New(Driver{}, nil).(*db) diff --git a/qbdb/main.go b/qbdb/main.go index a9dd92f..e0c51e1 100644 --- a/qbdb/main.go +++ b/qbdb/main.go @@ -1,11 +1,11 @@ -package qbdb // import "git.ultraware.nl/Ultraware/qb/v2/qbdb" +package qbdb // import "github.com/Ultraware/qb/v3/qbdb" import ( "context" "fmt" "strings" - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) // Render returns the generated SQL and values without executing the query diff --git a/qbdb/types.go b/qbdb/types.go index dafed36..a1e2df2 100644 --- a/qbdb/types.go +++ b/qbdb/types.go @@ -5,7 +5,7 @@ import ( "database/sql" "errors" - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) // Target is a target for a query, either a plain DB or a Tx diff --git a/qc/condition.go b/qc/condition.go index 21f1d19..b6bdd3e 100644 --- a/qc/condition.go +++ b/qc/condition.go @@ -1,10 +1,10 @@ -package qc // import "git.ultraware.nl/Ultraware/qb/v2/qc" +package qc // import "github.com/Ultraware/qb/v3/qc" import ( "reflect" "strings" - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) func createOperatorCondition(i1, i2 interface{}, operator string) qb.Condition { diff --git a/qc/condition_test.go b/qc/condition_test.go index 6653088..c4ab5ec 100644 --- a/qc/condition_test.go +++ b/qc/condition_test.go @@ -3,9 +3,9 @@ package qc import ( "testing" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" - "git.ultraware.nl/Ultraware/qb/v2/qbdb" + "github.com/Ultraware/qb/v3" + "github.com/Ultraware/qb/v3/internal/testutil" + "github.com/Ultraware/qb/v3/qbdb" ) func TestAll(t *testing.T) { diff --git a/qc/helper.go b/qc/helper.go index 8a7c1aa..1e67809 100644 --- a/qc/helper.go +++ b/qc/helper.go @@ -1,7 +1,7 @@ package qc import ( - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) // NewCondition returns a new Condition diff --git a/qf/case.go b/qf/case.go index 7b447fc..d76c62f 100644 --- a/qf/case.go +++ b/qf/case.go @@ -3,7 +3,7 @@ package qf import ( "strings" - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) type when struct { diff --git a/qf/case_test.go b/qf/case_test.go index 298c77c..1fea320 100644 --- a/qf/case_test.go +++ b/qf/case_test.go @@ -3,8 +3,8 @@ package qf import ( "testing" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" + "github.com/Ultraware/qb/v3" + "github.com/Ultraware/qb/v3/internal/testutil" ) var ( diff --git a/qf/field.go b/qf/field.go index c5a162a..275af10 100644 --- a/qf/field.go +++ b/qf/field.go @@ -1,7 +1,7 @@ package qf import ( - "git.ultraware.nl/Ultraware/qb/v2" + "github.com/Ultraware/qb/v3" ) // CalculatedField is a field created by running functions on a TableField diff --git a/qf/functions.go b/qf/functions.go index 12e90d0..fef82e2 100644 --- a/qf/functions.go +++ b/qf/functions.go @@ -1,6 +1,6 @@ -package qf // import "git.ultraware.nl/Ultraware/qb/v2/qf" +package qf // import "github.com/Ultraware/qb/v3/qf" -import "git.ultraware.nl/Ultraware/qb/v2" +import "github.com/Ultraware/qb/v3" ///// General functions ///// diff --git a/qf/functions_test.go b/qf/functions_test.go index 35d975d..5db9048 100644 --- a/qf/functions_test.go +++ b/qf/functions_test.go @@ -3,9 +3,9 @@ package qf import ( "testing" - "git.ultraware.nl/Ultraware/qb/v2" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" - "git.ultraware.nl/Ultraware/qb/v2/qbdb" + "github.com/Ultraware/qb/v3" + "github.com/Ultraware/qb/v3/internal/testutil" + "github.com/Ultraware/qb/v3/qbdb" ) func TestAll(t *testing.T) { diff --git a/sql_test.go b/sql_test.go index faec094..5d67696 100644 --- a/sql_test.go +++ b/sql_test.go @@ -3,7 +3,7 @@ package qb import ( "testing" - "git.ultraware.nl/Ultraware/qb/v2/internal/testutil" + "github.com/Ultraware/qb/v3/internal/testutil" ) func BenchmarkSQLWrite(b *testing.B) { From d9599fddff8c7ff61adbe0f618938e20571f58f0 Mon Sep 17 00:00:00 2001 From: Robin Knaapen Date: Tue, 21 Apr 2026 17:17:28 +0200 Subject: [PATCH 2/4] Update Go version and dependencies --- go.mod | 15 ++++++------- go.sum | 66 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index 64e2e40..ae05273 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,21 @@ module github.com/Ultraware/qb/v3 -go 1.23.0 +go 1.26.0 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/go-cmp v0.7.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 ) diff --git a/go.sum b/go.sum index db124c7..2e410a1 100644 --- a/go.sum +++ b/go.sum @@ -1,54 +1,56 @@ -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= +filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= git.fuyu.moe/Fuyu/assert v0.2.1 h1:F8faRzPp0AhzGDYzv0S6eehbRTb72dc0V2ZMMo39ryo= git.fuyu.moe/Fuyu/assert v0.2.1/go.mod h1:Q/wfl8GbNF2ZRkaVOd4zcxr+1MTQ3UZLywWwaxxBzkk= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 h1:U2rTu3Ef+7w9FHKIAXM6ZyqF3UOWJZ12zIm8zECAFfg= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= -github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw= -github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= -github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= -github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= -github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= -github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0 h1:E4MgwLBGeVB5f2MdcIVD3ELVAWpr+WD6MUe1i+tM/PA= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.4.0/go.mod h1:Y2b/1clN4zsAoUd/pgNAQHjLDnTis/6ROkUfyob6psM= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 h1:nCYfgcSyHZXJI8J0IWE5MsCGlb2xp9fJiXyxWgmOFg4= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0/go.mod h1:ucUjca2JtSZboY8IoUqyQyuuXvwbMBVwFOm0vdQPNhA= +github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs= +github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= -github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= -github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= +github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= -github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/microsoft/go-mssqldb v1.8.2 h1:236sewazvC8FvG6Dr3bszrVhMkAl4KYImryLkRMCd0I= -github.com/microsoft/go-mssqldb v1.8.2/go.mod h1:vp38dT33FGfVotRiTmDo3bFyaHq+p3LektQrjTULowo= +github.com/lib/pq v1.12.3 h1:tTWxr2YLKwIvK90ZXEw8GP7UFHtcbTtty8zsI+YjrfQ= +github.com/lib/pq v1.12.3/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA= +github.com/microsoft/go-mssqldb v1.9.8 h1:d4IFMvF/o+HdpXUqbBfzHvn/NlFA75YGcfHUUvDFJEM= +github.com/microsoft/go-mssqldb v1.9.8/go.mod h1:eGSRSGAW4hKMy5YcAenhCDjIRm2rhqIdmmwgciMzLus= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= 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/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= +golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 97818c2c0cc2cc3af8883ab5e56e07f637e00fae Mon Sep 17 00:00:00 2001 From: Robin Knaapen Date: Tue, 21 Apr 2026 17:21:54 +0200 Subject: [PATCH 3/4] Update golangci-lint --- .github/workflows/ci.yml | 10 +-- .golangci.yml | 105 ++++++++++++++-------------- qb-architect/internal/util/panic.go | 2 +- qbdb/types.go | 2 +- 4 files changed, 58 insertions(+), 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8466340..e06a062 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.golangci.yml b/.golangci.yml index a81ab6c..a86d949 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,14 +1,9 @@ -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 @@ -16,10 +11,6 @@ linters: - 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$ diff --git a/qb-architect/internal/util/panic.go b/qb-architect/internal/util/panic.go index a9da082..adbcabe 100644 --- a/qb-architect/internal/util/panic.go +++ b/qb-architect/internal/util/panic.go @@ -1,4 +1,4 @@ -package util +package util //nolint: revive // PanicOnErr panics if err is not nil func PanicOnErr(err interface{}) { diff --git a/qbdb/types.go b/qbdb/types.go index a1e2df2..0961d62 100644 --- a/qbdb/types.go +++ b/qbdb/types.go @@ -114,7 +114,7 @@ func (db *db) Begin() (Tx, error) { // BeginTx starts a transaction func (db *db) BeginTx(c context.Context, o *sql.TxOptions) (Tx, error) { rawTx, err := db.DB.BeginTx(c, o) - return &tx{queryTarget{rawTx, db.queryTarget.driver, db.queryTarget.debug}, rawTx}, err + return &tx{queryTarget{rawTx, db.driver, db.debug}, rawTx}, err } // MustBegin is the same as Begin, but it panics if an error occurred From 73aa32bcad035d7c0d8783a15d9f721c44a70ca3 Mon Sep 17 00:00:00 2001 From: Robin Knaapen Date: Tue, 21 Apr 2026 17:28:14 +0200 Subject: [PATCH 4/4] Fix oldstable --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index ae05273..4c70f10 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Ultraware/qb/v3 -go 1.26.0 +go 1.25.7 require ( git.fuyu.moe/Fuyu/assert v0.2.1 @@ -13,7 +13,7 @@ require ( 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.7.0 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect golang.org/x/crypto v0.50.0 // indirect diff --git a/go.sum b/go.sum index 2e410a1..6feb1ca 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= -github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=