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 643da620
authored
Jan 14, 2015
by
ksmithut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed test for passing configuration options along with db string
1 parent
bc20526d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
lib/sequelize.js
lib/sequelize.js
View file @
643da62
...
@@ -104,6 +104,9 @@ module.exports = (function() {
...
@@ -104,6 +104,9 @@ module.exports = (function() {
if
(
arguments
.
length
===
1
||
(
arguments
.
length
===
2
&&
typeof
username
===
'object'
))
{
if
(
arguments
.
length
===
1
||
(
arguments
.
length
===
2
&&
typeof
username
===
'object'
))
{
options
=
username
||
{};
options
=
username
||
{};
urlParts
=
url
.
parse
(
arguments
[
0
]);
urlParts
=
url
.
parse
(
arguments
[
0
]);
// reset username and password to null so we don't pass the options as the username
username
=
null
;
password
=
null
;
// SQLite don't have DB in connection url
// SQLite don't have DB in connection url
if
(
urlParts
.
pathname
)
{
if
(
urlParts
.
pathname
)
{
...
@@ -1066,7 +1069,7 @@ module.exports = (function() {
...
@@ -1066,7 +1069,7 @@ module.exports = (function() {
if
(
last
&&
Utils
.
_
.
isPlainObject
(
last
)
&&
last
.
hasOwnProperty
(
'logging'
))
{
if
(
last
&&
Utils
.
_
.
isPlainObject
(
last
)
&&
last
.
hasOwnProperty
(
'logging'
))
{
options
=
last
;
options
=
last
;
// remove options from set of logged arguments
// remove options from set of logged arguments
args
.
splice
(
args
.
length
-
1
,
1
);
args
.
splice
(
args
.
length
-
1
,
1
);
}
else
{
}
else
{
...
...
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