adjust code to new repository

This commit is contained in:
T. R. Bernstein
2025-10-09 21:02:10 +02:00
committed by T. R. Bernstein
parent 0cf34c475b
commit 795cd8335f
335 changed files with 803 additions and 802 deletions

View File

@@ -10,11 +10,11 @@ import (
"strings"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/tools/dbutils"
"github.com/pocketbase/pocketbase/tools/inflector"
"github.com/pocketbase/pocketbase/tools/list"
"github.com/pocketbase/pocketbase/tools/search"
"github.com/pocketbase/pocketbase/tools/security"
"github.com/tabshift-gh/pocketbase/tools/dbutils"
"github.com/tabshift-gh/pocketbase/tools/inflector"
"github.com/tabshift-gh/pocketbase/tools/list"
"github.com/tabshift-gh/pocketbase/tools/search"
"github.com/tabshift-gh/pocketbase/tools/security"
"github.com/spf13/cast"
)
@@ -536,7 +536,7 @@ func (r *runner) processActiveProps() (*search.ResolverResult, error) {
return nil, fmt.Errorf("failed to initialize back relation field %q", backField.GetName())
}
if backRelField.CollectionId != collection.Id {
// https://github.com/pocketbase/pocketbase/discussions/6590#discussioncomment-12496581
// https://github.com/tabshift-gh/pocketbase/discussions/6590#discussioncomment-12496581
if r.nullifyMisingField {
return &search.ResolverResult{Identifier: "NULL"}, nil
}
@@ -832,7 +832,7 @@ func (r *runner) finalizeActivePropsProcessing(collection *Collection, prop stri
// wrap in json_extract to ensure that top-level primitives
// stored as json work correctly when compared to their SQL equivalent
// (https://github.com/pocketbase/pocketbase/issues/4068)
// (https://github.com/tabshift-gh/pocketbase/issues/4068)
if field.Type() == FieldTypeJSON {
result.NullFallback = search.NullFallbackDisabled
result.Identifier = dbutils.JSONExtract(r.activeTableAlias+"."+cleanFieldName, "")