fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-2922 (pull request #5575)

Browse Source 
HOR-2922

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2017-04-06 19:37:46 +00:00
committed by Julio Cesar Laura Avendaño
parent c7ea5f2c0f 54418b0470
commit 5aeda509b7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.pmDynaform.php
View File

@@ -926,8 +926,7 @@ class pmDynaform
$where = "";
if (!empty($parsed["WHERE"])) {
$where = "WHERE ";
$dt = ($parsed['WHERE'][0]['expr_type'] == 'expression') ? $parsed['WHERE'][0]['sub_tree'] :
$parsed["WHERE"];
$dt = ($parsed['WHERE'][0]['expr_type'] == 'expression') ? $parsed['WHERE'][0]['sub_tree'] : $parsed["WHERE"];
$nw = count($dt);
//reserved word: OFFSET
if ($dt[$nw - 2]["base_expr"] === "OFFSET") {
@@ -953,7 +952,8 @@ class pmDynaform
$groupBy = "GROUP BY ";
$dt = $parsed["GROUP"];
foreach ($dt as $key => $value) {
$groupBy .= $value["base_expr"] . ", ";
$search = preg_replace("/ ASC$/i", "", $value["base_expr"]);
$groupBy .= $search . ", ";
}
$groupBy = rtrim($groupBy, ", ");
}
@@ -974,10 +974,10 @@ class pmDynaform
$orderBy = "ORDER BY ";
$dt = $parsed["ORDER"];
foreach ($dt as $key => $value) {
$orderBy .= $value["base_expr"] . ", ";
$search = preg_replace("/ ASC$/i", "", $value["base_expr"]);
$orderBy .= $search . " " . $value["direction"] . ", ";
}
$orderBy = rtrim($orderBy, ", ");
$orderBy .= " " . $value["direction"];
}
$orderBy = trim($orderBy);