From f170a3ba9bed17d03d736f3aa9ab55160474a3d7 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Sat, 31 Jan 2015 13:11:03 +0100
Subject: [PATCH] application/Boostrap.php: use resource plugin for database.

---
 application/Bootstrap.php                  | 22 +---------------------
 application/configs/application.sample.ini | 14 ++++++++------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 4de9211..79c1337 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -239,26 +239,6 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         return $translate;
     }
 
-    /**
-     * Setup a sweet and simple database
-     * connection.
-     *
-     * @return Zend_Db
-     */
-    protected function _initDatabase()
-    {
-        // Access config for database user/pass ..
-        $config = $this->getApplication()->getOptions();
-
-        // Setup database adapter
-        $database = Zend_Db::factory($config['db']['adapter'], $config['db']);
-
-        // Use the  adapter by default
-        Zend_Db_Table::setDefaultAdapter($database);
-
-        return $database;
-    }
-
     /**
      * Setup auth
      *
@@ -280,7 +260,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
      */
     protected function _initSession()
     {
-        $this->bootstrap('database');
+        $this->bootstrap('db');
 
         // Setup session storage in database
         $options = array(
diff --git a/application/configs/application.sample.ini b/application/configs/application.sample.ini
index fbf5375..16c0809 100644
--- a/application/configs/application.sample.ini
+++ b/application/configs/application.sample.ini
@@ -12,12 +12,14 @@ app.url = "fiktivkod.org"
 defaults.lang = sv
 
 // Database
-db.adapter  = mysqli
-db.host     = localhost
-db.username = user
-db.password = password
-db.dbname   = dbname
-db.port     = 3306
+resources.db.adapter                = mysqli
+resources.db.params.host            = localhost
+resources.db.params.username        = user
+resources.db.params.password        = password
+resources.db.params.dbname          = dbname
+;resources.db.params.port            = 3306
+resources.db.params.charset         = utf8
+resources.db.isDefaultTableAdapter  = true
 
 [production : general]
 // Error settings