From acaeef172a96f613704a08c5fdc0d192be9eab31 Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Thu, 22 Dec 2016 13:23:17 +0800
Subject: Fix #293

---
 lib/models/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/models')

diff --git a/lib/models/index.js b/lib/models/index.js
index d52f5508..1156d0f7 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -13,10 +13,11 @@ var dbconfig = config.db;
 dbconfig.logging = config.debug ? logger.info : false;
 
 var sequelize = null;
-if (dbconfig.hasOwnProperty('username') || dbconfig.hasOwnProperty('password'))
-    sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
+
+if (process.env.DATABASE_URL)
+    sequelize = new Sequelize(process.env.DATABASE_URL, dbconfig.username, dbconfig.password, dbconfig);
 else
-    sequelize = new Sequelize(dbconfig.database, dbconfig);
+    sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
 
 var db = {};
 
-- 
cgit v1.2.3


From 3a091ff9a52e510c362ad57cc816599b8ae2b53a Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Thu, 22 Dec 2016 19:42:00 +0800
Subject: Simplify code for heroku

---
 lib/models/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/models')

diff --git a/lib/models/index.js b/lib/models/index.js
index 1156d0f7..6fcffb5f 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -14,8 +14,9 @@ dbconfig.logging = config.debug ? logger.info : false;
 
 var sequelize = null;
 
+// Heroku specific
 if (process.env.DATABASE_URL)
-    sequelize = new Sequelize(process.env.DATABASE_URL, dbconfig.username, dbconfig.password, dbconfig);
+    sequelize = new Sequelize(process.env.DATABASE_URL);
 else
     sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
 
-- 
cgit v1.2.3


From 96fb3743f31acca0c6b272de3e8656384c2cda89 Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Thu, 22 Dec 2016 21:20:43 +0800
Subject: Use dburl to configurate

---
 lib/models/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/models')

diff --git a/lib/models/index.js b/lib/models/index.js
index 6fcffb5f..de6cd13c 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -15,8 +15,8 @@ dbconfig.logging = config.debug ? logger.info : false;
 var sequelize = null;
 
 // Heroku specific
-if (process.env.DATABASE_URL)
-    sequelize = new Sequelize(process.env.DATABASE_URL);
+if (config.dburl)
+    sequelize = new Sequelize(config.dburl, dbconfig);
 else
     sequelize = new Sequelize(dbconfig.database, dbconfig.username, dbconfig.password, dbconfig);
 
-- 
cgit v1.2.3