X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdatabase.php;h=1a53d0a4a2f0b4eb35e3d151870007fd463e78a1;hb=e460e503df60eec92ab83b3167eed2e5399097f5;hp=30792197135d5d46a6e70f4d9112128bbc285e8f;hpb=b66bceda2b37dcf421e4d8f5bc007c8b7f7863c7;p=core.git
diff --git a/inc/database.php b/inc/database.php
index 30792197..1a53d0a4 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -22,63 +22,32 @@
* along with this program. If not, see .
*/
-// Initialize layer
-$layerInstance = null;
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
+// Initialize database layer
+$databaseInstance = null;
// Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s.php",
- $cfg->readConfig('base_path'),
- $cfg->readConfig('db_type')
-);
+$fqfn = FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->readConfig('db_type') . '.php';
// Load the database layer include
-if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
+if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
// Load the layer
- require_once($INC);
+ require_once($fqfn);
} else {
// Layer is missing!
ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",
- $cfg->readConfig('db_type')
+ FrameworkConfiguration::getInstance()->readConfig('db_type')
));
}
// Clean it up
-unset($INC);
+unset($fqfn);
// Prepare database instance
-try {
- $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
-} catch (NullPointerException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-} catch (InvalidDirectoryResourceException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-} catch (PathIsEmptyException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-} catch (PathIsNoDirectoryException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-} catch (PathReadProtectedException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-} catch (DirPointerNotOpenedException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n",
- $e->getMessage()
- ));
-}
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);
// Is the app variable there and valid?
-if (is_object($app)) $app->setDatabaseInstance($db);
+// @TODO Rewrite this
+if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
// [EOF]
?>