不要怂,就是干,撸起袖子干!

Commit c1de6f1f by Jan Aagaard Meier

Merge pull request #4145 from sequelize/hotfix/mssql-server

Update mssql test credentials
2 parents 26582414 286ec23c
Showing with 9 additions and 8 deletions
...@@ -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:
......
...@@ -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.amazonaws.com', host: process.env.SEQ_MSSQL_HOST || process.env.SEQ_HOST || 'mssql.sequelizejs.com',
port: process.env.SEQ_MSSQL_PORT || process.env.SEQ_PORT || 1433, port: process.env.SEQ_MSSQL_PORT || process.env.SEQ_PORT || 11433,
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
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!