resultType is now removed (was not used anyway)

diff --git a/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php b/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php
index 1ec0e50ed81a43378841d3fec2eeeb386ac627bd..426fe38bb0c94d48c39ed054f0a65f207b2af3c3 100644 (file)
--- 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
         *
         * 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
         */
         * @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
 
        /**
         * '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 37dca8fcc4f2c3fa83c6e0a199b69db411a02477..6a6dd559aa848bc01ac4a69b38d7bf9bc61e6cb1 100644 (file)
--- 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
         *
         * 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
         */
         * @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;
 
                // 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 c55c75159c8f1a665115efb27a522410b75f74ba..84b8cc24b82e88edd7b9660a239825d753338539 100644 (file)
--- 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
                $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;
 
                // Return the result
                return $result;