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 3c2c807a
authored
May 26, 2013
by
Jan Aagaard Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
find or create returns additional flag
1 parent
0c35b450
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
lib/dao-factory.js
lib/utils.js
spec/dao-factory.spec.js
lib/dao-factory.js
View file @
3c2c807
...
...
@@ -342,13 +342,13 @@ module.exports = (function() {
self
.
create
(
params
)
.
success
(
function
(
instance
)
{
emitter
.
emit
(
'success'
,
instance
)
emitter
.
emit
(
'success'
,
instance
,
true
)
})
.
error
(
function
(
error
)
{
emitter
.
emit
(
'error'
,
error
)
})
}
else
{
emitter
.
emit
(
'success'
,
instance
)
emitter
.
emit
(
'success'
,
instance
,
false
)
}
}).
error
(
function
(
error
)
{
emitter
.
emit
(
'error'
,
error
)
...
...
lib/utils.js
View file @
3c2c807
spec/dao-factory.spec.js
View file @
3c2c807
...
...
@@ -216,9 +216,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
this
.
User
.
create
(
data
).
success
(
function
(
user
)
{
self
.
User
.
findOrCreate
({
username
:
user
.
username
}).
success
(
function
(
_user
)
{
}).
success
(
function
(
_user
,
created
)
{
expect
(
_user
.
id
).
toEqual
(
user
.
id
)
expect
(
_user
.
username
).
toEqual
(
'Username'
)
expect
(
created
).
toBeFalse
()
done
()
})
})
...
...
@@ -232,10 +234,12 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
};
this
.
User
.
create
(
data
).
success
(
function
(
user
)
{
self
.
User
.
findOrCreate
(
data
).
success
(
function
(
_user
)
{
self
.
User
.
findOrCreate
(
data
).
success
(
function
(
_user
,
created
)
{
expect
(
_user
.
id
).
toEqual
(
user
.
id
)
expect
(
_user
.
username
).
toEqual
(
'Username'
)
expect
(
_user
.
data
).
toEqual
(
'ThisIsData'
)
expect
(
created
).
toBeFalse
()
done
()
})
})
...
...
@@ -250,9 +254,11 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
data
:
'ThisIsData'
};
this
.
User
.
findOrCreate
(
data
,
default_values
).
success
(
function
(
user
)
{
this
.
User
.
findOrCreate
(
data
,
default_values
).
success
(
function
(
user
,
created
)
{
expect
(
user
.
username
).
toEqual
(
'Username'
)
expect
(
user
.
data
).
toEqual
(
'ThisIsData'
)
expect
(
created
).
toBeTrue
()
done
()
})
})
...
...
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