depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #277 from hackmdio/heroku-sequelize

Browse source 
Fix heroku production postgres setting
This commit is contained in:
Max Wu 2016-12-12 13:22:04 +08:00 committed by GitHub
commit 159be6a7c7
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/heroku
View file

@ -19,10 +19,16 @@ module.exports = {
EOF EOF
cat << EOF > config.json cat << EOF > config.json
{ {
"production": { "production": {
"db": {
"database": "${DATABASE_URL}",
"dialectOptions": {
"ssl": true
}
}
} }
} }

9
lib/models/index.js
View file

@ -11,7 +11,12 @@ var logger = require("../logger.js");
var dbconfig = config.db; var dbconfig = config.db;
dbconfig.logging = config.debug ? logger.info : false; dbconfig.logging = config.debug ? logger.info : false;
var sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
var sequelize = null;
if (dbconfig.hasOwnProperty('username') || dbconfig.hasOwnProperty('password'))
sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
else
sequelize = new Sequelize(dbconfig.database, dbconfig);
var db = {}; var db = {};
@ -34,4 +39,4 @@ Object.keys(db).forEach(function (modelName) {
db.sequelize = sequelize; db.sequelize = sequelize;
db.Sequelize = Sequelize; db.Sequelize = Sequelize;
module.exports = db; module.exports = db;