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

Commit c8ca9b22 by papb

ci: simplify mssql configuration

1 parent 598d5886
...@@ -160,6 +160,8 @@ jobs: ...@@ -160,6 +160,8 @@ jobs:
--health-retries 10 --health-retries 10
env: env:
DIALECT: mssql DIALECT: mssql
SEQ_USER: SA
SEQ_PW: Password12!
steps: steps:
- run: /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE sequelize_test; ALTER DATABASE sequelize_test SET READ_COMMITTED_SNAPSHOT ON;" - run: /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE sequelize_test; ALTER DATABASE sequelize_test SET READ_COMMITTED_SNAPSHOT ON;"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
......
'use strict'; 'use strict';
const fs = require('fs'); const { env } = process;
let mssqlConfig;
try {
mssqlConfig = JSON.parse(fs.readFileSync(`${__dirname}/mssql.json`, 'utf8'));
} catch (e) {
// ignore
}
const env = process.env;
module.exports = { module.exports = {
username: env.SEQ_USER || 'root', username: env.SEQ_USER || 'root',
...@@ -23,16 +16,16 @@ module.exports = { ...@@ -23,16 +16,16 @@ module.exports = {
return parseInt(Math.random() * 999, 10); return parseInt(Math.random() * 999, 10);
}, },
mssql: mssqlConfig || { mssql: {
database: env.SEQ_MSSQL_DB || env.SEQ_DB || 'sequelize_test', host: env.SEQ_MSSQL_HOST || env.SEQ_HOST || 'localhost',
username: env.SEQ_MSSQL_USER || env.SEQ_USER || 'sequelize', username: env.SEQ_MSSQL_USER || env.SEQ_USER || 'SA',
password: env.SEQ_MSSQL_PW || env.SEQ_PW || 'nEGkLma26gXVHFUAHJxcmsrK', password: env.SEQ_MSSQL_PW || env.SEQ_PW || 'Password12!',
host: env.SEQ_MSSQL_HOST || env.SEQ_HOST || '127.0.0.1',
port: env.SEQ_MSSQL_PORT || env.SEQ_PORT || 1433, port: env.SEQ_MSSQL_PORT || env.SEQ_PORT || 1433,
database: env.SEQ_MSSQL_DB || env.SEQ_DB || 'sequelize_test',
dialectOptions: { dialectOptions: {
options: { options: {
encrypt: false, encrypt: false,
requestTimeout: 60000 requestTimeout: 25000
} }
}, },
pool: { pool: {
......
{
"host": "localhost",
"username": "SA",
"password": "Password12!",
"port": 1433,
"database": "sequelize_test",
"dialectOptions": {
"options": {
"encrypt": false,
"requestTimeout": 25000
}
},
"pool": {
"max": 5,
"idle": 3000
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!