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 c1de6f1f
authored
Jul 21, 2015
by
Jan Aagaard Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4145 from sequelize/hotfix/mssql-server
Update mssql test credentials
2 parents
26582414
286ec23c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
.travis.yml
test/config/config.js
.travis.yml
View file @
c1de6f1
...
@@ -18,6 +18,7 @@ env:
...
@@ -18,6 +18,7 @@ env:
-
DIALECT=postgres-native
-
DIALECT=postgres-native
-
DIALECT=sqlite
-
DIALECT=sqlite
-
DIALECT=mariadb
-
DIALECT=mariadb
-
DIALECT=mssql
addons
:
addons
:
postgresql
:
"
9.4"
postgresql
:
"
9.4"
...
@@ -40,13 +41,9 @@ matrix:
...
@@ -40,13 +41,9 @@ matrix:
include
:
include
:
-
node_js
:
"
0.10"
-
node_js
:
"
0.10"
env
:
COVERAGE=true
env
:
COVERAGE=true
-
node_js
:
"
0.12"
env
:
DIALECT=mssql
allow_failures
:
allow_failures
:
-
node_js
:
"
0.10"
-
node_js
:
"
0.10"
env
:
COVERAGE=true
env
:
COVERAGE=true
-
node_js
:
"
0.12"
env
:
DIALECT=mssql
notifications
:
notifications
:
hipchat
:
hipchat
:
...
...
test/config/config.js
View file @
c1de6f1
...
@@ -15,11 +15,15 @@ module.exports = {
...
@@ -15,11 +15,15 @@ module.exports = {
},
},
mssql
:
{
mssql
:
{
database
:
process
.
env
.
SEQ_MSSQL_DB
||
process
.
env
.
SEQ_DB
||
(
'sequelize_test_'
+
~~
(
Math
.
random
()
*
100
)),
database
:
process
.
env
.
SEQ_MSSQL_DB
||
process
.
env
.
SEQ_DB
||
(
function
()
{
var
db
=
'sequelize-test-'
+
~~
(
Math
.
random
()
*
100
);
console
.
log
(
'Using database: '
,
db
);
return
db
;
}()),
username
:
process
.
env
.
SEQ_MSSQL_USER
||
process
.
env
.
SEQ_USER
||
'sequelize'
,
username
:
process
.
env
.
SEQ_MSSQL_USER
||
process
.
env
.
SEQ_USER
||
'sequelize'
,
password
:
process
.
env
.
SEQ_MSSQL_PW
||
process
.
env
.
SEQ_PW
||
'
test
'
,
password
:
process
.
env
.
SEQ_MSSQL_PW
||
process
.
env
.
SEQ_PW
||
'
nEGkLma26gXVHFUAHJxcmsrK
'
,
host
:
process
.
env
.
SEQ_MSSQL_HOST
||
process
.
env
.
SEQ_HOST
||
'
ec2-54-85-24-15.compute-1.amazonaw
s.com'
,
host
:
process
.
env
.
SEQ_MSSQL_HOST
||
process
.
env
.
SEQ_HOST
||
'
mssql.sequelizej
s.com'
,
port
:
process
.
env
.
SEQ_MSSQL_PORT
||
process
.
env
.
SEQ_PORT
||
1433
,
port
:
process
.
env
.
SEQ_MSSQL_PORT
||
process
.
env
.
SEQ_PORT
||
1
1
433
,
pool
:
{
pool
:
{
maxConnections
:
process
.
env
.
SEQ_MSSQL_POOL_MAX
||
process
.
env
.
SEQ_POOL_MAX
||
5
,
maxConnections
:
process
.
env
.
SEQ_MSSQL_POOL_MAX
||
process
.
env
.
SEQ_POOL_MAX
||
5
,
maxIdleTime
:
process
.
env
.
SEQ_MSSQL_POOL_IDLE
||
process
.
env
.
SEQ_POOL_IDLE
||
3000
maxIdleTime
:
process
.
env
.
SEQ_MSSQL_POOL_IDLE
||
process
.
env
.
SEQ_POOL_IDLE
||
3000
...
...
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