diff --git a/common/framework/db.php b/common/framework/db.php index bdbae6614..a82ac56af 100644 --- a/common/framework/db.php +++ b/common/framework/db.php @@ -465,6 +465,10 @@ class DB { return null; } + if ($result_type === 'raw') + { + return $stmt; + } $result = array(); $index = $last_index; diff --git a/common/legacy.php b/common/legacy.php index d57b0aa17..71ebd6656 100644 --- a/common/legacy.php +++ b/common/legacy.php @@ -134,30 +134,30 @@ function getClass($module_name) * * @see DB::executeQuery() * @param string $query_id (module name.query XML file) - * @param object $args values of args object - * @param string[] $arg_columns Column list + * @param array|object $args Arguments + * @param array $column_list Column list + * @param string $result_type 'auto', 'array' or 'raw' * @return object Query result data */ -function executeQuery($query_id, $args = [], $arg_columns = NULL) +function executeQuery($query_id, $args = [], $column_list = [], $result_type = 'auto') { $oDB = Rhymix\Framework\DB::getInstance(); - return $oDB->executeQuery($query_id, $args, $arg_columns, 'auto'); + return $oDB->executeQuery($query_id, $args, $column_list, $result_type); } /** * Function to handle the result of DB::executeQuery() as an array * * @see DB::executeQuery() - * @see executeQuery() * @param string $query_id (module name.query XML file) - * @param object $args values of args object - * @param string[] $arg_columns Column list + * @param array|object $args Arguments + * @param array $column_list Column list * @return object Query result data */ -function executeQueryArray($query_id, $args = [], $arg_columns = NULL) +function executeQueryArray($query_id, $args = [], $column_list = []) { $oDB = Rhymix\Framework\DB::getInstance(); - return $oDB->executeQuery($query_id, $args, $arg_columns, 'array'); + return $oDB->executeQuery($query_id, $args, $column_list, 'array'); } /**