Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit 78a1fb6c
authored
Mar 10, 2018
by
Aaron Williams
Committed by
Sushant
Mar 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(model/bulkCreate): properly pass error instances to AggregateError (#9133)
1 parent
d5cd9d8d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
3 deletions
docs/instances.md
lib/errors/index.js
lib/model.js
test/integration/model/bulk-create.test.js
docs/instances.md
View file @
78a1fb6
...
...
@@ -167,7 +167,7 @@ Task.bulkCreate([
}).
spread
((
affectedCount
,
affectedRows
)
=>
{
// .update returns two values in an array, therefore we use .spread
// Notice that affectedRows will only be defined in dialects which support returning: true
// affectedCount will be 2
return
Task
.
findAll
();
}).
then
(
tasks
=>
{
...
...
@@ -235,12 +235,16 @@ Tasks.bulkCreate([
[
{ record:
...
name: 'SequelizeBulkRecordError',
message: 'Validation error',
errors:
{ name: 'SequelizeValidationError',
message: 'Validation error',
errors: [Object] } },
{ record:
...
name: 'SequelizeBulkRecordError',
message: 'Validation error',
errors:
{ name: 'SequelizeValidationError',
message: 'Validation error',
...
...
lib/errors/index.js
View file @
78a1fb6
...
...
@@ -524,3 +524,21 @@ class QueryError extends BaseError {
}
}
exports
.
QueryError
=
QueryError
;
/**
* Thrown when bulk operation fails, it represent per record level error.
* Used with Promise.AggregateError
*
* @param {Error} error Error for a given record/instance
* @param {Object} record DAO instance that error belongs to
*/
class
BulkRecordError
extends
BaseError
{
constructor
(
error
,
record
)
{
super
(
error
.
message
);
this
.
name
=
'SequelizeBulkRecordError'
;
this
.
errors
=
error
;
this
.
record
=
record
;
Error
.
captureStackTrace
(
this
,
this
.
constructor
);
}
}
exports
.
BulkRecordError
=
BulkRecordError
;
lib/model.js
View file @
78a1fb6
...
...
@@ -2374,7 +2374,7 @@ class Model {
return
Promise
.
map
(
instances
,
instance
=>
instance
.
validate
(
validateOptions
).
catch
(
err
=>
{
errors
.
push
(
{
record
:
instance
,
errors
:
err
}
);
errors
.
push
(
new
sequelizeErrors
.
BulkRecordError
(
err
,
instance
)
);
})
).
then
(()
=>
{
delete
options
.
skip
;
...
...
test/integration/model/bulk-create.test.js
View file @
78a1fb6
...
...
@@ -292,7 +292,12 @@ describe(Support.getTestDialectTeaser('Model'), () => {
{
code
:
'1234'
},
{
name
:
'bar'
,
code
:
'1'
}
],
{
validate
:
true
}).
catch
(
errors
=>
{
const
expectedValidationError
=
'Validation len on code failed'
;
const
expectedNotNullError
=
'notNull Violation: Task.name cannot be null'
;
expect
(
errors
).
to
.
be
.
instanceof
(
Promise
.
AggregateError
);
expect
(
errors
.
toString
()).
to
.
include
(
expectedValidationError
)
.
and
.
to
.
include
(
expectedNotNullError
);
expect
(
errors
).
to
.
have
.
length
(
2
);
const
e0name0
=
errors
[
0
].
errors
.
get
(
'name'
)[
0
];
...
...
@@ -302,7 +307,7 @@ describe(Support.getTestDialectTeaser('Model'), () => {
expect
(
errors
[
1
].
record
.
name
).
to
.
equal
(
'bar'
);
expect
(
errors
[
1
].
record
.
code
).
to
.
equal
(
'1'
);
expect
(
errors
[
1
].
errors
.
get
(
'code'
)[
0
].
message
).
to
.
equal
(
'Validation len on code failed'
);
expect
(
errors
[
1
].
errors
.
get
(
'code'
)[
0
].
message
).
to
.
equal
(
expectedValidationError
);
});
});
});
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment