Continued:

[core.git] / framework / main / classes / database / class_BaseDatabaseWrapper.php

diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index d8b47b5825101ec018b7320db9368baa1f396653..4456a0d1f11405e182e50855742fa2a2d2f28076 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Database\Frontend;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Database\Backend\BaseDatabaseBackend;
@@ -112,7 +113,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
                } // END - if
 
                // Handle it over to the middleware
-               $this->getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
+               FrameworkBootstrap::getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
        }
 
        /**
@@ -140,7 +141,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
                } // END - if
 
                // Handle it over to the middleware
-               $this->getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);
+               FrameworkBootstrap::getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);
        }
 
        /**
@@ -149,7 +150,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
         * @return      $indexKey       Index key
         */
        public final function getIndexKey () {
-               return $this->getDatabaseInstance()->getIndexKey();
+               return FrameworkBootstrap::getDatabaseInstance()->getIndexKey();
        }
 
        /**
@@ -158,7 +159,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
         * @return      $lastException  Last exception or NULL if none occured
         */
        public final function getLastException () {
-               return $this->getDatabaseInstance()->getLastException();
+               return FrameworkBootstrap::getDatabaseInstance()->getLastException();
        }
 
        /**
@@ -191,7 +192,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-WRAPPER: Quering database, cacheKey=' . $cacheKey);
 
                        // Now it's time to ask the database layer for this select statement
-                       $result = $this->getDatabaseInstance()->doSelectByTableCriteria($this->getTableName(), $criteriaInstance);
+                       $result = FrameworkBootstrap::getDatabaseInstance()->doSelectByTableCriteria($this->getTableName(), $criteriaInstance);
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-WRAPPER: result[]=' . gettype($result));
 
                        // Cache the result if not null
@@ -205,7 +206,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
                                // This invalid result must be wrapped
                                $result = array(
                                        BaseDatabaseBackend::RESULT_INDEX_STATUS    => 'invalid',
-                                       BaseDatabaseBackend::RESULT_INDEX_EXCEPTION => $this->getDatabaseInstance()->getLastException()
+                                       BaseDatabaseBackend::RESULT_INDEX_EXCEPTION => FrameworkBootstrap::getDatabaseInstance()->getLastException()
                                );
                        }
                }
@@ -252,7 +253,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
         */
        public final function getPrimaryKeyValue () {
                // Get the table name and a database instance and ask for it
-               $primaryKey = $this->getDatabaseInstance()->getPrimaryKeyOfTable($this->getTableName());
+               $primaryKey = FrameworkBootstrap::getDatabaseInstance()->getPrimaryKeyOfTable($this->getTableName());
 
                // Return value
                return $primaryKey;
@@ -265,7 +266,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
         */
        public final function countTotalRows () {
                // Get the table name and a database instance and ask for it
-               $count = $this->getDatabaseInstance()->countTotalRows($this->getTableName());
+               $count = FrameworkBootstrap::getDatabaseInstance()->countTotalRows($this->getTableName());
 
                // Return value
                return $count;
@@ -279,7 +280,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem {
         */
        public function removeNonPublicDataFromArray (array $data) {
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('WRAPPER[' . $this->__toString() . ']: Calling this->getDatabaseInstance()->removeNonPublicDataFromArray(data) ...');
-               $data = $this->getDatabaseInstance()->removeNonPublicDataFromArray($data);
+               $data = FrameworkBootstrap::getDatabaseInstance()->removeNonPublicDataFromArray($data);
 
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('WRAPPER[' . $this->__toString() . ']: data[]=' . gettype($data));
                return $data;