Skip to content

Commit 159be6a

Browse files
authored
Merge pull request #277 from hackmdio/heroku-sequelize
Fix heroku production postgres setting
2 parents bb3ed8e + 5282bf4 commit 159be6a

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

bin/heroku

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@ module.exports = {
1919
2020
EOF
2121

22-
cat << EOF > config.json
22+
cat << EOF > config.json
2323
2424
{
2525
"production": {
26+
"db": {
27+
"database": "${DATABASE_URL}",
28+
"dialectOptions": {
29+
"ssl": true
30+
}
31+
}
2632
}
2733
}
2834

lib/models/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ var logger = require("../logger.js");
1111

1212
var dbconfig = config.db;
1313
dbconfig.logging = config.debug ? logger.info : false;
14-
var sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
14+
15+
var sequelize = null;
16+
if (dbconfig.hasOwnProperty('username') || dbconfig.hasOwnProperty('password'))
17+
sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
18+
else
19+
sequelize = new Sequelize(dbconfig.database, dbconfig);
1520

1621
var db = {};
1722

@@ -34,4 +39,4 @@ Object.keys(db).forEach(function (modelName) {
3439
db.sequelize = sequelize;
3540
db.Sequelize = Sequelize;
3641

37-
module.exports = db;
42+
module.exports = db;

0 commit comments

Comments
 (0)