Skip to content

Commit cc5440f

Browse files
author
Mike Eldridge
committed
allow supplying a database password for tests and migrations
Also make test/knexfile.js match mocha.start.js in terms of defaults for environment variables.
1 parent ae1622c commit cc5440f

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

mocha.start.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ if (DB_CLIENT === 'sqlite3') {
2525
user: process.env.DB_USER || 'root',
2626
database: process.env.DB_NAME || 'test'
2727
}
28+
29+
if (process.env.DB_PASS) {
30+
connection.password = process.env.DB_PASS
31+
}
2832
}
2933

3034
JSDataAdapterTests.init({

test/knexfile.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ if (DB_CLIENT === 'sqlite3') {
99
} else {
1010
connection = {
1111
host: process.env.DB_HOST || '127.0.0.1',
12-
user: process.env.DB_USER,
13-
database: process.env.DB_NAME
12+
user: process.env.DB_USER || 'root',
13+
database: process.env.DB_NAME || 'test'
14+
}
15+
16+
if (process.env.DB_PASS) {
17+
connection.password = process.env.DB_PASS
1418
}
1519
}
1620

0 commit comments

Comments
 (0)