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 7d7fac97
authored
Feb 13, 2015
by
Nick Acker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression in MSSQL ConnectionManager
1 parent
009f4dab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
lib/dialects/mssql/connection-manager.js
lib/dialects/mssql/connection-manager.js
View file @
7d7fac9
...
@@ -28,16 +28,17 @@ ConnectionManager.prototype.connect = function(config) {
...
@@ -28,16 +28,17 @@ ConnectionManager.prototype.connect = function(config) {
server
:
config
.
host
,
server
:
config
.
host
,
/* domain: 'DOMAIN' */
/* domain: 'DOMAIN' */
options
:
{
options
:
{
port
:
config
.
port
,
database
:
config
.
database
,
database
:
config
.
database
,
}
}
};
};
// only set port if no instance name was provided
if
(
!
config
.
dialectOptions
.
instanceName
){
connectionConfig
.
options
.
port
=
config
.
port
;
}
if
(
config
.
dialectOptions
)
{
if
(
config
.
dialectOptions
)
{
// only set port if no instance name was provided
if
(
config
.
dialectOptions
.
instanceName
)
{
delete
connectionConfig
.
options
.
port
;
}
Object
.
keys
(
config
.
dialectOptions
).
forEach
(
function
(
key
)
{
Object
.
keys
(
config
.
dialectOptions
).
forEach
(
function
(
key
)
{
connectionConfig
.
options
[
key
]
=
config
.
dialectOptions
[
key
];
connectionConfig
.
options
[
key
]
=
config
.
dialectOptions
[
key
];
});
});
...
...
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