X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Fdatabase%2Fclass_BaseDatabaseWrapper.php;h=52674a68f80597e37a35641b4a7f2556ac42192b;hb=f57dd51863ec9baacba447d76b46d5c709b9b02e;hp=d8b47b5825101ec018b7320db9368baa1f396653;hpb=b002c5909aa0f781505dde5414964b0f014cde01;p=core.git

diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index d8b47b58..52674a68 100644
--- 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;
@@ -14,7 +15,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -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;