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

HOR-2922

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-03-28 11:00:23 -04:00
parent bf56da719b
commit fe1edd9e7f
1 changed files with 6 additions and 4 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 = ""; $where = "";
if (!empty($parsed["WHERE"])) { if (!empty($parsed["WHERE"])) {
$where = "WHERE "; $where = "WHERE ";
$dt = ($parsed['WHERE'][0]['expr_type'] == 'expression') ? $parsed['WHERE'][0]['sub_tree'] : $dt = ($parsed['WHERE'][0]['expr_type'] == 'expression') ? $parsed['WHERE'][0]['sub_tree'] : $parsed["WHERE"];
$parsed["WHERE"];
$nw = count($dt); $nw = count($dt);
//reserved word: OFFSET //reserved word: OFFSET
if ($dt[$nw - 2]["base_expr"] === "OFFSET") { if ($dt[$nw - 2]["base_expr"] === "OFFSET") {
@@ -953,9 +952,11 @@ class pmDynaform
$groupBy = "GROUP BY "; $groupBy = "GROUP BY ";
$dt = $parsed["GROUP"]; $dt = $parsed["GROUP"];
foreach ($dt as $key => $value) { foreach ($dt as $key => $value) {
$groupBy .= $value["base_expr"] . ", "; $search = explode(" ", $value["base_expr"]);
$groupBy .= $search[0] . ", ";
} }
$groupBy = rtrim($groupBy, ", "); $groupBy = rtrim($groupBy, ", ");
$groupBy .= " " . $value["direction"];
} }
$groupBy = trim($groupBy); $groupBy = trim($groupBy);
@@ -974,7 +975,8 @@ class pmDynaform
$orderBy = "ORDER BY "; $orderBy = "ORDER BY ";
$dt = $parsed["ORDER"]; $dt = $parsed["ORDER"];
foreach ($dt as $key => $value) { foreach ($dt as $key => $value) {
$orderBy .= $value["base_expr"] . ", "; $search = explode(" ", $value["base_expr"]);
$orderBy .= $search[0] . ", ";
} }
$orderBy = rtrim($orderBy, ", "); $orderBy = rtrim($orderBy, ", ");
$orderBy .= " " . $value["direction"]; $orderBy .= " " . $value["direction"];