From b9cd4613eb44845c2081f5107aca0a32c5944ae3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 27 Oct 2011 16:26:39 +0000 Subject: [PATCH] resultType is now removed (was not used anyway) --- .../database/frontend/class_DatabaseFrontendInterface.php | 3 +-- .../main/database/databases/class_LocalFileDatabase.php | 3 +-- inc/classes/middleware/database/class_DatabaseConnection.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php b/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php index 1ec0e50e..426fe38b 100644 --- a/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php +++ b/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php @@ -37,14 +37,13 @@ interface DatabaseFrontendInterface extends FrameworkDatabaseInterface { * Starts a SELECT query on the database by given return type, table name * and search criteria * - * @param $resultType Result type ('array', 'object' and 'indexed' are valid) * @param $tableName Name of the database table * @param $criteria Search criteria class * @return $resultData Result data of the query * @throws UnsupportedCriteriaException If the criteria is unsupported * @throws SqlException If an SQL error occurs */ - function querySelect ($resultType, $tableName, LocalSearchCriteria $criteriaInstance); + function querySelect ($tableName, LocalSearchCriteria $criteriaInstance); /** * 'Inserts' a data set instance into a local file database folder diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php index 37dca8fc..6a6dd559 100644 --- a/inc/classes/main/database/databases/class_LocalFileDatabase.php +++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php @@ -337,14 +337,13 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend * Starts a SELECT query on the database by given return type, table name * and search criteria * - * @param $resultType Result type ('array', 'object' and 'indexed' are valid) * @param $tableName Name of the database table * @param $criteria Local search criteria class * @return $resultData Result data of the query * @throws UnsupportedCriteriaException If the criteria is unsupported * @throws SqlException If an 'SQL error' occurs */ - public function querySelect ($resultType, $tableName, LocalSearchCriteria $criteriaInstance) { + public function querySelect ($tableName, LocalSearchCriteria $criteriaInstance) { // The result is null by any errors $resultData = NULL; diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php index c55c7515..84b8cc24 100644 --- a/inc/classes/middleware/database/class_DatabaseConnection.php +++ b/inc/classes/middleware/database/class_DatabaseConnection.php @@ -120,7 +120,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re $this->dbLayer->connectToDatabase(); // Get result from query - $result = $this->dbLayer->querySelect('array', $tableName, $criteriaInstance); + $result = $this->dbLayer->querySelect($tableName, $criteriaInstance); // Return the result return $result; -- 2.30.2