noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure sub-queries can access super-parent queries correctly

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2021-02-11 18:41:39 +00:00
parent fd0abd2d8e
commit 8bf36e8bf2
7 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
db/create.go
View file

@ -96,11 +96,12 @@ func (e *executor) fetchCreate(ctx context.Context, stm *sql.CreateStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/delete.go
View file

@ -95,11 +95,12 @@ func (e *executor) fetchDelete(ctx context.Context, stm *sql.DeleteStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/insert.go
View file

@ -64,11 +64,12 @@ func (e *executor) fetchInsert(ctx context.Context, stm *sql.InsertStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/relate.go
View file

@ -88,11 +88,12 @@ func (e *executor) fetchRelate(ctx context.Context, stm *sql.RelateStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/select.go
View file

@ -96,11 +96,12 @@ func (e *executor) fetchSelect(ctx context.Context, stm *sql.SelectStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/update.go
View file

@ -95,11 +95,12 @@ func (e *executor) fetchUpdate(ctx context.Context, stm *sql.UpdateStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)

5
db/upsert.go
View file

@ -64,11 +64,12 @@ func (e *executor) fetchUpsert(ctx context.Context, stm *sql.UpsertStatement, do
if doc != nil { if doc != nil {
vars := data.New() vars := data.New()
vars.Set(doc.Data(), varKeyParent) vars.Set(doc.Data(), varKeyParent)
vars.Array(varKeyParents)
if subs := ctx.Value(ctxKeySubs); subs != nil { if subs := ctx.Value(ctxKeySubs); subs != nil {
if subs, ok := subs.(*data.Doc); ok { if subs, ok := subs.(*data.Doc); ok {
vars.Append(subs.Get(varKeyParents).Data(), varKeyParents) vars.Set(subs.Get(varKeyParents).Data(), varKeyParents)
} }
} else {
vars.Array(varKeyParents)
} }
vars.Append(doc.Data(), varKeyParents) vars.Append(doc.Data(), varKeyParents)
ctx = context.WithValue(ctx, ctxKeySubs, vars) ctx = context.WithValue(ctx, ctxKeySubs, vars)