X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fclass_BaseDatabaseWrapper.php;h=63d121c90af517c30ac50756b04071d1fee63c78;hp=e925f38607e4ca88e9d0bd64d433420ecd7502dc;hb=0aa26cbbe1dcfcd42beee694b29fec8c994ce253;hpb=3cfc834fbd3fae00c5edc65033c0f043fc4186a2

diff --git a/inc/classes/main/database/class_BaseDatabaseWrapper.php b/inc/classes/main/database/class_BaseDatabaseWrapper.php
index e925f386..63d121c9 100644
--- a/inc/classes/main/database/class_BaseDatabaseWrapper.php
+++ b/inc/classes/main/database/class_BaseDatabaseWrapper.php
@@ -84,7 +84,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 	protected function queryInsertDataSet (StoreableCriteria $dataSetInstance, array $onlyKeys = array()) {
 		// First get a key suitable for our cache and extend it with this class name
 		$cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
-		//* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
 
 		// Does this key exists in cache?
 		if ($this->cacheInstance->offsetExists($cacheKey)) {
@@ -106,7 +106,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 	protected function queryUpdateDataSet (StoreableCriteria $dataSetInstance, array $onlyKeys = array()) {
 		// First get a key suitable for our cache and extend it with this class name
 		$cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
-		//* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
 
 		// Does this key exists in cache?
 		if ($this->cacheInstance->offsetExists($cacheKey)) {
@@ -151,13 +151,13 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 		// Does this key exists in cache?
 		if ($this->cacheInstance->offsetExists($cacheKey)) {
 			// Debug message
-			//* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Cache used for cacheKey=' . $cacheKey);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-WRAPPER: Cache used for cacheKey=' . $cacheKey);
 
 			// Then use this result
 			$result = $this->cacheInstance->offsetGet($cacheKey);
 		} else {
 			// Debug message
-			//* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Quering database, cacheKey=' . $cacheKey);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->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);
@@ -169,14 +169,14 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 			} else {
 				// This invalid result must be wrapped
 				$result = array(
-					BaseDatabaseFrontend::RESULT_INDEX_STATUS    => 'invalid',
-					BaseDatabaseFrontend::RESULT_INDEX_EXCEPTION => $this->getDatabaseInstance()->getLastException()
+					BaseDatabaseBackend::RESULT_INDEX_STATUS    => 'invalid',
+					BaseDatabaseBackend::RESULT_INDEX_EXCEPTION => $this->getDatabaseInstance()->getLastException()
 				);
 			}
 		}
 
 		// Create an instance of a DatabaseResult class with the given result
-		$resultInstance = DatabaseResult::createDatabaseResult($result);
+		$resultInstance = ObjectFactory::createObjectByConfiguredName('database_result_class', array($result));
 
 		// And return the instance
 		return $resultInstance;
@@ -202,7 +202,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 			$numRows = $resultInstance->getAffectedRows();
 
 			// Debug message
-			//* DEBUG: */ $this->debugOutput('BASE-WRAPPER: numRows=' . $numRows);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-WRAPPER: numRows=' . $numRows);
 		} // END - if
 
 		// Return the result