File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ async function resolveConfig (opts, cfgFile) {
6363 ...cfg ,
6464 options : {
6565 ...( config . options || { } ) ,
66- ...cfg . options ,
66+ ...cfg . options
6767 }
6868 }
6969}
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ class ConnectionPool extends BaseConnectionPool {
1313 server : this . config . server ,
1414 options : Object . assign ( {
1515 encrypt : typeof this . config . encrypt === 'boolean' ? this . config . encrypt : true ,
16- trustServerCertificate : typeof this . config . trustServerCertificate === 'boolean' ? this . config . trustServerCertificate : false ,
16+ trustServerCertificate : typeof this . config . trustServerCertificate === 'boolean' ? this . config . trustServerCertificate : false
1717 } , this . config . options ) ,
1818 authentication : Object . assign ( {
1919 type : this . config . domain !== undefined ? 'ntlm' : this . config . authentication_type !== undefined ? this . config . authentication_type : 'default' ,
You can’t perform that action at this time.
0 commit comments