diff --git a/apis/record_auth_with_oauth2.go b/apis/record_auth_with_oauth2.go index ed80481d..4dc41ca2 100644 --- a/apis/record_auth_with_oauth2.go +++ b/apis/record_auth_with_oauth2.go @@ -17,8 +17,8 @@ import ( "syscall" "time" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/auth" "github.com/pocketbase/pocketbase/tools/dbutils" diff --git a/apis/record_auth_with_password.go b/apis/record_auth_with_password.go index 288ff0e6..180783cf 100644 --- a/apis/record_auth_with_password.go +++ b/apis/record_auth_with_password.go @@ -6,9 +6,9 @@ import ( "slices" "strings" + "github.com/pocketbase/dbx" validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/ozzo-validation/v4/is" - "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/dbutils" "github.com/pocketbase/pocketbase/tools/list" diff --git a/core/auth_origin_model.go b/core/auth_origin_model.go index 81369809..6970ddfd 100644 --- a/core/auth_origin_model.go +++ b/core/auth_origin_model.go @@ -5,8 +5,8 @@ import ( "errors" "slices" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/hook" "github.com/pocketbase/pocketbase/tools/types" ) diff --git a/core/collection_record_table_sync.go b/core/collection_record_table_sync.go index 458964b4..93967c59 100644 --- a/core/collection_record_table_sync.go +++ b/core/collection_record_table_sync.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/dbutils" "github.com/pocketbase/pocketbase/tools/security" ) diff --git a/core/collection_validate.go b/core/collection_validate.go index d5efbfb0..a63b5039 100644 --- a/core/collection_validate.go +++ b/core/collection_validate.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core/validators" "github.com/pocketbase/pocketbase/tools/dbutils" "github.com/pocketbase/pocketbase/tools/list" diff --git a/core/db.go b/core/db.go index c3ed0592..d92f1cbd 100644 --- a/core/db.go +++ b/core/db.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/security" "github.com/spf13/cast" ) diff --git a/core/field_relation.go b/core/field_relation.go index 3900eccf..51cbe313 100644 --- a/core/field_relation.go +++ b/core/field_relation.go @@ -4,8 +4,8 @@ import ( "context" "database/sql/driver" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/list" "github.com/pocketbase/pocketbase/tools/types" ) diff --git a/core/field_text.go b/core/field_text.go index ade54c32..b2e35224 100644 --- a/core/field_text.go +++ b/core/field_text.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core/validators" "github.com/pocketbase/pocketbase/tools/security" "github.com/spf13/cast" diff --git a/core/record_field_resolver.go b/core/record_field_resolver.go index dca38dad..caabe131 100644 --- a/core/record_field_resolver.go +++ b/core/record_field_resolver.go @@ -241,6 +241,7 @@ func (r *RecordFieldResolver) updateQueryWithDeduplicateConstraint(query *dbx.Se // } } +//nolint:unused func preferGroupBy(info *dbx.QueryInfo, fullUnquotedGroupByCol string) bool { if len(info.GroupBy) != 0 { return false diff --git a/core/record_model.go b/core/record_model.go index f7324deb..a0c0617c 100644 --- a/core/record_model.go +++ b/core/record_model.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core/validators" "github.com/pocketbase/pocketbase/tools/dbutils" "github.com/pocketbase/pocketbase/tools/filesystem" diff --git a/core/record_query_expand.go b/core/record_query_expand.go index c8472d2d..7a87da5d 100644 --- a/core/record_query_expand.go +++ b/core/record_query_expand.go @@ -175,7 +175,7 @@ func (app *BaseApp) expandRecords(records []*Record, expandPath string, fetchFun } } } - existsSet = nil + existsSet = nil //nolint:ineffassign // fetch rels rels, relsErr := fetchFunc(relCollection, relIds) diff --git a/core/settings_model.go b/core/settings_model.go index b5a18f6c..4b0e95f0 100644 --- a/core/settings_model.go +++ b/core/settings_model.go @@ -259,6 +259,7 @@ func (s *Settings) DBExport(app App) (map[string]any, error) { // @todo remove with encoding/json/2 // serialize as empty array + //nolint:staticcheck if s.settings.SuperuserIPs == nil { s.settings.SuperuserIPs = []string{} } diff --git a/core/validators/db.go b/core/validators/db.go index 40369796..051a33a9 100644 --- a/core/validators/db.go +++ b/core/validators/db.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" ) // UniqueId checks whether a field string id already exists in the specified table. diff --git a/forms/apple_client_secret_create.go b/forms/apple_client_secret_create.go index 02575e7a..5a22a9d1 100644 --- a/forms/apple_client_secret_create.go +++ b/forms/apple_client_secret_create.go @@ -5,8 +5,8 @@ import ( "strings" "time" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/golang-jwt/jwt/v5" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" ) diff --git a/forms/record_upsert.go b/forms/record_upsert.go index f60a52e6..16df0ece 100644 --- a/forms/record_upsert.go +++ b/forms/record_upsert.go @@ -6,8 +6,8 @@ import ( "fmt" "slices" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core/validators" "github.com/pocketbase/pocketbase/tools/security" diff --git a/plugins/jsvm/binds.go b/plugins/jsvm/binds.go index 2cc1e383..8cbe06cf 100644 --- a/plugins/jsvm/binds.go +++ b/plugins/jsvm/binds.go @@ -19,9 +19,9 @@ import ( "time" "github.com/dop251/goja" - validation "github.com/pocketbase/ozzo-validation/v4" "github.com/golang-jwt/jwt/v5" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/forms"