Skip to content

[Feature] [V2] Fix Error Message for CreateCollectionWithOptions #634

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

Merged
merged 2 commits into from
Nov 15, 2024
Merged

[Feature] [V2] Fix Error Message for CreateCollectionWithOptions #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b56f789
[Feature] [V2] Fix Error Message for CreateCollectionWithOptions
ajanikow Nov 7, 2024
d423cf6
Merge branch 'master' into feature/v2/error_fix
ajanikow Nov 15, 2024
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
1 change: 1 addition & 0 deletions v2/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Adjust Cursor options
- Switch to Go 1.22.8
- Remove deprecated context functions
- Fix Error Handler in CreateCollectionWithOptions

## [2.1.1](https://github.com/arangodb/go-driver/tree/v2.1.1) (2024-09-27)
- Improve backup tests stability
Expand Down
9 changes: 5 additions & 4 deletions v2/arangodb/database_collection_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,16 @@ func (d databaseCollection) CreateCollectionWithOptions(ctx context.Context, nam

urlEndpoint := d.db.url("_api", "collection")
reqData := struct {
shared.ResponseStruct `json:",inline"`
Name string `json:"name"`
Name string `json:"name"`
*CreateCollectionProperties
}{
Name: name,
CreateCollectionProperties: props,
}

resp, err := connection.CallPost(ctx, d.db.connection(), urlEndpoint, nil, &reqData, append(d.db.modifiers, options.modifyRequest)...)
var respData shared.ResponseStruct

resp, err := connection.CallPost(ctx, d.db.connection(), urlEndpoint, &respData, &reqData, append(d.db.modifiers, options.modifyRequest)...)
if err != nil {
return nil, errors.WithStack(err)
}
Expand All @@ -139,6 +140,6 @@ func (d databaseCollection) CreateCollectionWithOptions(ctx context.Context, nam
case http.StatusOK:
return newCollection(d.db, name), nil
default:
return nil, reqData.AsArangoErrorWithCode(code)
return nil, respData.AsArangoErrorWithCode(code)
}
}
5 changes: 5 additions & 0 deletions v2/arangodb/shared/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ func (ae ArangoError) Error() string {
return fmt.Sprintf("ArangoError: Code %d, ErrorNum %d", ae.Code, ae.ErrorNum)
}

// FullError returns the full error message of an ArangoError.
func (ae ArangoError) FullError() string {
return fmt.Sprintf("ArangoError: Code %d, ErrorNum %d: %s", ae.Code, ae.ErrorNum, ae.ErrorMessage)
}

// Timeout returns true when the given error is a timeout error.
func (ae ArangoError) Timeout() bool {
return ae.HasError && (ae.Code == http.StatusRequestTimeout || ae.Code == http.StatusGatewayTimeout)
Expand Down