summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xbin/heroku31
-rw-r--r--lib/models/index.js10
2 files changed, 10 insertions, 31 deletions
diff --git a/bin/heroku b/bin/heroku
index b0d0797a..0375e9e7 100755
--- a/bin/heroku
+++ b/bin/heroku
@@ -18,27 +18,13 @@ module.exports = {
}
EOF
- regex='postgres:\/\/([^:]+):([^@]+)@([^:]+):([^\/]+)\/(.+)'
- if [[ $DATABASE_URL =~ $regex ]]; then
-
- username="${BASH_REMATCH[1]}"
- password="${BASH_REMATCH[2]}"
- host="${BASH_REMATCH[3]}"
- port="${BASH_REMATCH[4]}"
- database="${BASH_REMATCH[5]}"
-
- cat << EOF > config.json
+ cat << EOF > config.json
{
"production": {
"db": {
- "dialect": "postgres",
- "host": "${host}",
- "username": "${username}",
- "password": "${password}",
- "database": "${database}",
- "port": "${port}",
+ "database": "${DATABASE_URL}",
"dialectOptions": {
"ssl": true
}
@@ -47,19 +33,6 @@ EOF
}
EOF
- else
-
- cat << EOF > config.json
-
-{
- "production": {
- }
-}
-
-EOF
-
- fi
-
cp public/js/config.js.example public/js/config.js
diff --git a/lib/models/index.js b/lib/models/index.js
index 3b49d459..60eedf61 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -11,7 +11,13 @@ var logger = require("../logger.js");
var dbconfig = config.db;
dbconfig.logging = config.debug ? logger.info : false;
-var sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+
+var sequelize;
+if (typeof dbconfig.username === 'undefined' && typeof dbconfig.password === 'undefined') {
+ sequelize = new Sequelize(dbconfig.database, dbconfig);
+} else {
+ sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+}
var db = {};
@@ -34,4 +40,4 @@ Object.keys(db).forEach(function (modelName) {
db.sequelize = sequelize;
db.Sequelize = Sequelize;
-module.exports = db; \ No newline at end of file
+module.exports = db;