diff options
| -rw-r--r-- | src/main/scala/cake/application.scala | 5 | ||||
| -rw-r--r-- | src/main/scala/cake/database.scala | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/scala/cake/application.scala b/src/main/scala/cake/application.scala index 20ef0ed..e9dcda1 100644 --- a/src/main/scala/cake/application.scala +++ b/src/main/scala/cake/application.scala @@ -1,8 +1,9 @@ package cake.application -import cake.services._ +import cake.logger.Logger +import cake.database.Database -class Application (val logger: HasLogger#ILogger, val dbh: HasDatabase#IDatabase) { +class Application (val logger: Logger, val dbh: Database) { def run (): Unit = { logger.log("starting") logger.log("got a dbh: " + dbh) diff --git a/src/main/scala/cake/database.scala b/src/main/scala/cake/database.scala index f0de51c..f22a356 100644 --- a/src/main/scala/cake/database.scala +++ b/src/main/scala/cake/database.scala @@ -1,9 +1,13 @@ package cake.database +trait Database { + def query (search: String): String +} + class DBI protected ( val dsn: String, val username: String, - val password: String) { + val password: String) extends Database { def query (search: String): String = "found " + search override def toString = List(dsn, username, password).mkString(", ") } |