adjust code to new repository
This commit is contained in:
committed by
T. R. Bernstein
parent
0cf34c475b
commit
795cd8335f
+6
-6
@@ -9,12 +9,12 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/cron"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/pocketbase/pocketbase/tools/store"
|
||||
"github.com/pocketbase/pocketbase/tools/subscriptions"
|
||||
"github.com/tabshift-gh/pocketbase/tools/cron"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/tools/store"
|
||||
"github.com/tabshift-gh/pocketbase/tools/subscriptions"
|
||||
)
|
||||
|
||||
// App defines the main PocketBase app interface.
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
const CollectionNameAuthOrigins = "_authOrigins"
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNewAuthOrigin(t *testing.T) {
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestFindAllAuthOriginsByRecord(t *testing.T) {
|
||||
|
||||
+11
-11
@@ -16,15 +16,15 @@ import (
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/cron"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/logger"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/pocketbase/pocketbase/tools/routine"
|
||||
"github.com/pocketbase/pocketbase/tools/store"
|
||||
"github.com/pocketbase/pocketbase/tools/subscriptions"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/cron"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/logger"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/tools/routine"
|
||||
"github.com/tabshift-gh/pocketbase/tools/store"
|
||||
"github.com/tabshift-gh/pocketbase/tools/subscriptions"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
"golang.org/x/sync/semaphore"
|
||||
)
|
||||
@@ -1233,7 +1233,7 @@ func normalizeSQLLog(sql string) string {
|
||||
|
||||
func (app *BaseApp) initAuxDB() error {
|
||||
// note: renamed to "auxiliary" because "aux" is a reserved Windows filename
|
||||
// (see https://github.com/pocketbase/pocketbase/issues/5607)
|
||||
// (see https://github.com/tabshift-gh/pocketbase/issues/5607)
|
||||
dbPath := filepath.Join(app.DataDir(), "auxiliary.db")
|
||||
|
||||
concurrentDB, err := app.config.DBConnect(dbPath)
|
||||
@@ -1314,7 +1314,7 @@ func (app *BaseApp) registerBaseHooks() {
|
||||
Func: func(e *ModelEvent) error {
|
||||
if m, ok := e.Model.(FilesManager); ok && m.BaseFilesPath() != "" && supportFiles(e.Model) {
|
||||
// ensure that there is a trailing slash so that the list iterator could start walking from the prefix dir
|
||||
// (https://github.com/pocketbase/pocketbase/discussions/5246#discussioncomment-10128955)
|
||||
// (https://github.com/tabshift-gh/pocketbase/discussions/5246#discussioncomment-10128955)
|
||||
prefix := strings.TrimRight(m.BaseFilesPath(), "/") + "/"
|
||||
|
||||
// note: for now assume no context cancellation
|
||||
|
||||
+6
-6
@@ -12,11 +12,11 @@ import (
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/archive"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/inflector"
|
||||
"github.com/pocketbase/pocketbase/tools/osutils"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/archive"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/inflector"
|
||||
"github.com/tabshift-gh/pocketbase/tools/osutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -145,7 +145,7 @@ func (app *BaseApp) CreateBackup(ctx context.Context, name string) error {
|
||||
//
|
||||
// Note that if your pb_data has custom network mounts as subdirectories, then
|
||||
// it is possible the restore to fail during the `os.Rename` operations
|
||||
// (see https://github.com/pocketbase/pocketbase/issues/4647).
|
||||
// (see https://github.com/tabshift-gh/pocketbase/issues/4647).
|
||||
func (app *BaseApp) RestoreBackup(ctx context.Context, name string) error {
|
||||
if app.Store().Has(StoreKeyActiveBackup) {
|
||||
return errors.New("try again later - another backup/restore operation has already been started")
|
||||
|
||||
@@ -9,10 +9,10 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/archive"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/archive"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
func TestCreateBackup(t *testing.T) {
|
||||
|
||||
+4
-4
@@ -12,10 +12,10 @@ import (
|
||||
_ "unsafe"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/logger"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/logger"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
)
|
||||
|
||||
func TestNewBaseApp(t *testing.T) {
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestImportCollections(t *testing.T) {
|
||||
|
||||
@@ -7,10 +7,10 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -7,10 +7,10 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/pocketbase/pocketbase/tools/auth"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/auth"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
@@ -461,7 +461,7 @@ type OAuth2ProviderConfig struct {
|
||||
//
|
||||
// This usually shouldn't be needed but some OAuth2 vendors, like the LinkedIn OIDC,
|
||||
// may require manual adjustment due to returning error if extra parameters are added to the request
|
||||
// (https://github.com/pocketbase/pocketbase/discussions/3799#discussioncomment-7640312)
|
||||
// (https://github.com/tabshift-gh/pocketbase/discussions/3799#discussioncomment-7640312)
|
||||
PKCE *bool `form:"pkce" json:"pkce"`
|
||||
|
||||
Name string `form:"name" json:"name"`
|
||||
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/auth"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/auth"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestCollectionAuthOptionsValidate(t *testing.T) {
|
||||
|
||||
@@ -11,11 +11,11 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNewCollection(t *testing.T) {
|
||||
|
||||
@@ -3,8 +3,8 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestCollectionViewOptionsValidate(t *testing.T) {
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
const StoreKeyCachedCollections = "pbAppCachedCollections"
|
||||
@@ -299,7 +299,7 @@ func saveViewCollection(app App, newCollection, oldCollection *Collection) error
|
||||
// normalizeViewQueryId wraps (if necessary) the provided view query
|
||||
// with a subselect to ensure that the id column is a text since
|
||||
// currently we don't support non-string model ids
|
||||
// (see https://github.com/pocketbase/pocketbase/issues/3110).
|
||||
// (see https://github.com/tabshift-gh/pocketbase/issues/3110).
|
||||
func normalizeViewQueryId(app App, query string) (string, error) {
|
||||
query = strings.Trim(strings.TrimSpace(query), ";")
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
func TestCollectionQuery(t *testing.T) {
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
)
|
||||
|
||||
// SyncRecordTableSchema compares the two provided collections
|
||||
|
||||
@@ -6,10 +6,10 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestSyncRecordTableSchema(t *testing.T) {
|
||||
|
||||
@@ -9,11 +9,11 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/search"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/search"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
var collectionNameRegex = regexp.MustCompile(`^\w+$`)
|
||||
|
||||
@@ -3,9 +3,9 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestCollectionValidate(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
)
|
||||
|
||||
func TestBaseModel(t *testing.T) {
|
||||
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestHasTable(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestGenerateDefaultRandomId(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestRunInTransaction(t *testing.T) {
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/inflector"
|
||||
"github.com/pocketbase/pocketbase/tools/router"
|
||||
"github.com/tabshift-gh/pocketbase/tools/inflector"
|
||||
"github.com/tabshift-gh/pocketbase/tools/router"
|
||||
)
|
||||
|
||||
// Common request store keys used by the middlewares and api handlers.
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"net/http"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
)
|
||||
|
||||
type BatchRequestEvent struct {
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestInternalRequestValidate(t *testing.T) {
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestEventRequestRealIP(t *testing.T) {
|
||||
|
||||
+6
-6
@@ -7,12 +7,12 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/auth"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/pocketbase/pocketbase/tools/router"
|
||||
"github.com/pocketbase/pocketbase/tools/search"
|
||||
"github.com/pocketbase/pocketbase/tools/subscriptions"
|
||||
"github.com/tabshift-gh/pocketbase/tools/auth"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/tools/router"
|
||||
"github.com/tabshift-gh/pocketbase/tools/search"
|
||||
"github.com/tabshift-gh/pocketbase/tools/subscriptions"
|
||||
"golang.org/x/crypto/acme/autocert"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"errors"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/tools/auth"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/auth"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNewExternalAuth(t *testing.T) {
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestFindAllExternalAuthsByRecord(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ import (
|
||||
"strings"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
var fieldNameRegex = regexp.MustCompile(`^\w+$`)
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestAutodateFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestBoolFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestDateFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestEditorFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestEmailFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+4
-4
@@ -10,10 +10,10 @@ import (
|
||||
"strings"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -10,11 +10,11 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestFileFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestGeoPointFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestJSONFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"math"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNumberFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"strings"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -287,7 +287,7 @@ func (f *RelationField) checkCollectionId(app App, collection *Collection) valid
|
||||
}
|
||||
|
||||
// allow only views to have relations to other views
|
||||
// (see https://github.com/pocketbase/pocketbase/issues/3000)
|
||||
// (see https://github.com/tabshift-gh/pocketbase/issues/3000)
|
||||
if !collection.IsView() && relCollection.IsView() {
|
||||
return validation.NewError(
|
||||
"validation_relation_field_non_view_base_collection",
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestRelationFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"slices"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestSelectFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@ import (
|
||||
"testing"
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func testFieldBaseMethods(t *testing.T, fieldType string) {
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestTextFieldBaseMethods(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestURLFieldBaseMethods(t *testing.T) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
)
|
||||
|
||||
func TestNewFieldsList(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package core
|
||||
|
||||
import "github.com/pocketbase/pocketbase/tools/types"
|
||||
import "github.com/tabshift-gh/pocketbase/tools/types"
|
||||
|
||||
var (
|
||||
_ Model = (*Log)(nil)
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/pocketbase/pocketbase/tools/logger"
|
||||
"github.com/pocketbase/pocketbase/tools/store"
|
||||
"github.com/tabshift-gh/pocketbase/tools/logger"
|
||||
"github.com/tabshift-gh/pocketbase/tools/store"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/logger"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/logger"
|
||||
)
|
||||
|
||||
func TestBaseAppLoggerLevelDevPrint(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
// LogQuery returns a new Log select query.
|
||||
|
||||
@@ -7,9 +7,9 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestFindLogById(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNewMFA(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
// FindAllMFAsByRecord returns all MFA models linked to the provided auth record.
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestFindAllMFAsByRecord(t *testing.T) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
)
|
||||
|
||||
func TestMigrationsList(t *testing.T) {
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/osutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/osutils"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestMigrationsRunnerUpAndDown(t *testing.T) {
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
const CollectionNameOTPs = "_otps"
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestNewOTP(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
// FindAllOTPsByRecord returns all OTP models linked to the provided auth record.
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"slices"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestFindAllOTPsByRecord(t *testing.T) {
|
||||
|
||||
@@ -9,10 +9,10 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/inflector"
|
||||
"github.com/pocketbase/pocketbase/tools/search"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/inflector"
|
||||
"github.com/tabshift-gh/pocketbase/tools/search"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -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, "")
|
||||
|
||||
@@ -7,11 +7,11 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/search"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/search"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestRecordFieldResolverAllowedFields(t *testing.T) {
|
||||
|
||||
@@ -14,14 +14,14 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/inflector"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/pocketbase/pocketbase/tools/store"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/inflector"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/store"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package core
|
||||
|
||||
import "github.com/pocketbase/pocketbase/tools/security"
|
||||
import "github.com/tabshift-gh/pocketbase/tools/security"
|
||||
|
||||
// Email returns the "email" record field value (usually available with Auth collections).
|
||||
func (m *Record) Email() string {
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
)
|
||||
|
||||
func TestRecordEmail(t *testing.T) {
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/router"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/router"
|
||||
)
|
||||
|
||||
const CollectionNameSuperusers = "_superusers"
|
||||
|
||||
@@ -3,8 +3,8 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
)
|
||||
|
||||
func TestRecordIsSuperUser(t *testing.T) {
|
||||
|
||||
@@ -15,11 +15,11 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/filesystem"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/filesystem"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package core_test
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
)
|
||||
|
||||
func TestBaseRecordProxy(t *testing.T) {
|
||||
|
||||
@@ -9,11 +9,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"
|
||||
)
|
||||
|
||||
var recordProxyType = reflect.TypeOf((*RecordProxy)(nil)).Elem()
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
// ExpandFetchFunc defines the function that is used to fetch the expanded relation records.
|
||||
|
||||
@@ -10,9 +10,9 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/list"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/list"
|
||||
)
|
||||
|
||||
func TestExpandRecords(t *testing.T) {
|
||||
|
||||
@@ -9,10 +9,10 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/dbutils"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/dbutils"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestRecordQueryWithDifferentCollectionValues(t *testing.T) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/golang-jwt/jwt/v5"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
)
|
||||
|
||||
// Supported record token types
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/spf13/cast"
|
||||
)
|
||||
|
||||
|
||||
@@ -15,12 +15,12 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/pocketbase/pocketbase/core/validators"
|
||||
"github.com/pocketbase/pocketbase/tools/cron"
|
||||
"github.com/pocketbase/pocketbase/tools/hook"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core/validators"
|
||||
"github.com/tabshift-gh/pocketbase/tools/cron"
|
||||
"github.com/tabshift-gh/pocketbase/tools/hook"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/mailer"
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/mailer"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
)
|
||||
|
||||
func TestSettingsDelete(t *testing.T) {
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/pocketbase/pocketbase/tools/security"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/tools/security"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
type Param struct {
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
"github.com/pocketbase/pocketbase/tests"
|
||||
"github.com/pocketbase/pocketbase/tools/types"
|
||||
"github.com/tabshift-gh/pocketbase/core"
|
||||
"github.com/tabshift-gh/pocketbase/tests"
|
||||
"github.com/tabshift-gh/pocketbase/tools/types"
|
||||
)
|
||||
|
||||
func TestReloadSettings(t *testing.T) {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user