From 3c9b0ed55e3721595dafa273b015dec6add8c18b Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 16 Feb 2017 14:09:55 -0800
Subject: Providing custom config for database config

---
 src/main/scala/xyz/driver/core/database/database.scala | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 308c391..c14d0a5 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -1,29 +1,34 @@
 package xyz.driver.core
 
-import scala.concurrent.Future
-
 import slick.backend.DatabaseConfig
 import slick.driver.JdbcProfile
-import xyz.driver.core.time.Time
 import xyz.driver.core.date.Date
+import xyz.driver.core.time.Time
+
+import scala.concurrent.Future
 
 package database {
 
+  import com.typesafe.config.Config
+
   trait Database {
     val profile: JdbcProfile
     val database: JdbcProfile#Backend#Database
   }
 
   object Database {
-
-    def fromConfig(databaseName: String): Database = {
-      val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName)
+    def fromConfig(config: Config, databaseName: String): Database = {
+      val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName, config)
 
       new Database {
         val profile: JdbcProfile                   = dbConfig.driver
         val database: JdbcProfile#Backend#Database = dbConfig.db
       }
     }
+
+    def fromConfig(databaseName: String): Database = {
+      fromConfig(com.typesafe.config.ConfigFactory.load(), databaseName)
+    }
   }
 
   trait ColumnTypes {
-- 
cgit v1.2.3