From ef412688e9f853643091748fdb4c57299541e1ef Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 16 Jan 2015 18:10:19 +0100
Subject: [PATCH] setup: Require to set a path to the schema files

refs #8232
---
 modules/setup/library/Setup/Steps/DatabaseStep.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
index c6ec2ef2b..006b6c9ed 100644
--- a/modules/setup/library/Setup/Steps/DatabaseStep.php
+++ b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -6,7 +6,6 @@ namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use PDOException;
-use Icinga\Application\Icinga;
 use Icinga\Module\Setup\Step;
 use Icinga\Module\Setup\Utils\DbTool;
 use Icinga\Module\Setup\Exception\SetupException;
@@ -71,7 +70,7 @@ class DatabaseStep extends Step
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
-            $db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/mysql.schema.sql');
+            $db->import($this->data['schemaPath'] . '/mysql.schema.sql');
         }
 
         if ($db->hasLogin($this->data['resourceConfig']['username'])) {
@@ -122,7 +121,7 @@ class DatabaseStep extends Step
             $this->log(mt('setup', 'Database schema already exists...'));
         } else {
             $this->log(mt('setup', 'Creating database schema...'));
-            $db->import(Icinga::app()->getApplicationDir() . '/../etc/schema/pgsql.schema.sql');
+            $db->import($this->data['schemaPath'] . '/pgsql.schema.sql');
         }
 
         if ($db->hasLogin($this->data['resourceConfig']['username'])) {