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 c8683217
authored
Sep 22, 2014
by
overlookmotel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sequelize() hooks change name Instantiate to Init
1 parent
f58a9a03
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
lib/hooks.js
lib/sequelize.js
test/hooks.test.js
lib/hooks.js
View file @
c868321
...
...
@@ -56,8 +56,8 @@ var hookTypes = {
afterFind
:
{
params
:
2
},
beforeDefine
:
{
params
:
2
,
sync
:
true
},
afterDefine
:
{
params
:
1
,
sync
:
true
},
beforeIn
stantiate
:
{
params
:
2
,
sync
:
true
},
afterIn
stantiate
:
{
params
:
1
,
sync
:
true
}
beforeIn
it
:
{
params
:
2
,
sync
:
true
},
afterIn
it
:
{
params
:
1
,
sync
:
true
}
};
var
hookAliases
=
{
beforeDelete
:
'beforeDestroy'
,
...
...
@@ -370,8 +370,8 @@ Hooks.afterDefine = function(name, fn) {
* @param {String} name
* @param {Function} fn A callback function that is called with config, options, callback(err)
*/
Hooks
.
beforeIn
stantiate
=
function
(
name
,
fn
)
{
return
Hooks
.
addHook
.
call
(
this
,
'beforeIn
stantiate
'
,
name
,
fn
);
Hooks
.
beforeIn
it
=
function
(
name
,
fn
)
{
return
Hooks
.
addHook
.
call
(
this
,
'beforeIn
it
'
,
name
,
fn
);
};
/**
...
...
@@ -379,6 +379,6 @@ Hooks.beforeInstantiate = function(name, fn) {
* @param {String} name
* @param {Function} fn A callback function that is called with sequelize, callback(err)
*/
Hooks
.
afterIn
stantiate
=
function
(
name
,
fn
)
{
return
Hooks
.
addHook
.
call
(
this
,
'afterIn
stantiate
'
,
name
,
fn
);
Hooks
.
afterIn
it
=
function
(
name
,
fn
)
{
return
Hooks
.
addHook
.
call
(
this
,
'afterIn
it
'
,
name
,
fn
);
};
lib/sequelize.js
View file @
c868321
...
...
@@ -123,7 +123,7 @@ module.exports = (function() {
}
var
config
=
{
database
:
database
,
username
:
username
,
password
:
password
};
Sequelize
.
runHooks
(
'beforeIn
stantiate
'
,
config
,
options
);
Sequelize
.
runHooks
(
'beforeIn
it
'
,
config
,
options
);
database
=
config
.
database
;
username
=
config
.
username
;
password
=
config
.
password
;
...
...
@@ -196,7 +196,7 @@ module.exports = (function() {
this
.
importCache
=
{};
Sequelize
.
runHooks
(
'afterIn
stantiate
'
,
this
);
Sequelize
.
runHooks
(
'afterIn
it
'
,
this
);
};
Sequelize
.
options
=
{
hooks
:
{}};
...
...
test/hooks.test.js
View file @
c868321
...
...
@@ -4359,29 +4359,29 @@ describe(Support.getTestDialectTeaser("Hooks"), function () {
});
});
describe
(
'#in
stantiate
'
,
function
()
{
describe
(
'#in
it
'
,
function
()
{
before
(
function
()
{
Sequelize
.
addHook
(
'beforeIn
stantiate
'
,
function
(
config
,
options
)
{
Sequelize
.
addHook
(
'beforeIn
it
'
,
function
(
config
,
options
)
{
config
.
database
=
'db2'
;
options
.
host
=
'server9'
;
});
Sequelize
.
addHook
(
'afterIn
stantiate
'
,
function
(
sequelize
)
{
Sequelize
.
addHook
(
'afterIn
it
'
,
function
(
sequelize
)
{
sequelize
.
options
.
protocol
=
'udp'
;
});
this
.
seq
=
new
Sequelize
(
'db'
,
'user'
,
'pass'
,
{});
});
it
(
'beforeIn
stantiate
hook can alter config'
,
function
()
{
it
(
'beforeIn
it
hook can alter config'
,
function
()
{
expect
(
this
.
seq
.
config
.
database
).
to
.
equal
(
'db2'
);
});
it
(
'beforeIn
stantiate
hook can alter options'
,
function
()
{
it
(
'beforeIn
it
hook can alter options'
,
function
()
{
expect
(
this
.
seq
.
options
.
host
).
to
.
equal
(
'server9'
);
});
it
(
'afterIn
stantiate
hook can alter options'
,
function
()
{
it
(
'afterIn
it
hook can alter options'
,
function
()
{
expect
(
this
.
seq
.
options
.
protocol
).
to
.
equal
(
'udp'
);
});
...
...
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