Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use stringer for "enums" #2144

Merged
merged 9 commits into from
Mar 10, 2023
Merged

Use stringer for "enums" #2144

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a4a716a
Use `stringer` for "enums"
AlekSi Mar 6, 2023
0e0f6bf
Merge branch 'main' into stringer
mergify[bot] Mar 7, 2023
dfb9bc4
Merge branch 'main' into stringer
mergify[bot] Mar 7, 2023
62ea152
Merge branch 'main' into stringer
mergify[bot] Mar 7, 2023
85339c3
Merge branch 'main' into stringer
mergify[bot] Mar 9, 2023
fbfa605
Merge branch 'main' into stringer
mergify[bot] Mar 10, 2023
795d680
Make linter happy
AlekSi Mar 10, 2023
126ee8e
Merge branch 'main' into stringer
AlekSi Mar 10, 2023
264eaa4
Merge branch 'main' into stringer
mergify[bot] Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make linter happy
  • Loading branch information
@AlekSi
AlekSi committed Mar 10, 2023
commit 795d6808ffb1e76c01ad595fd7b5364886355a50
30 changes: 12 additions & 18 deletions internal/handlers/common/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,19 +260,15 @@ func processRenameFieldExpression(doc *types.Document, update *types.Document) (
sourcePath, err := types.NewPathFromString(key)
if err != nil {
var pathErr *types.DocumentPathError

if errors.As(err, &pathErr) {
switch pathErr.Code() {
case types.ErrDocumentPathEmptyKey:
return false, commonerrors.NewWriteErrorMsg(
commonerrors.ErrEmptyName,
fmt.Sprintf("Cannot apply $rename to a value of non-numeric type. "+
"{_id: %s} has the field '%s' of non-numeric type object",
must.NotFail(doc.Get("_id")),
key,
),
)
}
if errors.As(err, &pathErr) && pathErr.Code() == types.ErrDocumentPathEmptyKey {
return false, commonerrors.NewWriteErrorMsg(
commonerrors.ErrEmptyName,
fmt.Sprintf("Cannot apply $rename to a value of non-numeric type. "+
"{_id: %s} has the field '%s' of non-numeric type object",
must.NotFail(doc.Get("_id")),
key,
),
)
}
}

Expand All @@ -289,13 +285,11 @@ func processRenameFieldExpression(doc *types.Document, update *types.Document) (
panic("getByPath returned error with invalid type")
}

switch dpe.Code() {
case types.ErrDocumentPathKeyNotFound,
types.ErrDocumentPathIndexOutOfBound:
if dpe.Code() == types.ErrDocumentPathKeyNotFound || dpe.Code() == types.ErrDocumentPathIndexOutOfBound {
continue
default:
return changed, commonerrors.NewWriteErrorMsg(commonerrors.ErrUnsuitableValueType, dpe.Error())
}

return changed, commonerrors.NewWriteErrorMsg(commonerrors.ErrUnsuitableValueType, dpe.Error())
}

// Remove old document
Expand Down