diff --git a/core/components/pdotools/src/Fetch.php b/core/components/pdotools/src/Fetch.php
index 50377e9f..c2227e9c 100644
--- a/core/components/pdotools/src/Fetch.php
+++ b/core/components/pdotools/src/Fetch.php
@@ -222,21 +222,8 @@ public function addWhere()
$where = $this->additionalConditions($where);
if (!empty($where)) {
$this->query->where($where);
- $condition = [];
- foreach ($where as $k => $v) {
- if (is_array($v)) {
- if (isset($v[0])) {
- $condition[] = is_array($v) ? $k . '(' . implode(',', $v) . ')' : $k . '=' . $v;
- } else {
- foreach ($v as $k2 => $v2) {
- $condition[] = is_array($v2) ? $k2 . '(' . implode(',', $v2) . ')' : $k2 . '=' . $v2;
- }
- }
- } else {
- $condition[] = $k . '=' . $v;
- }
- }
- $this->addTime('Added where condition: ' . implode(', ', $condition) . '', microtime(true) - $time);
+ $whereLog = json_encode($where);
+ $this->addTime('Added where condition: ' . ($whereLog !== false ? $whereLog : print_r($where, true)) . ' ', microtime(true) - $time);
}
$time = microtime(true);
if (!empty($this->config['having'])) {
@@ -249,16 +236,8 @@ public function addWhere()
}
$having = $this->replaceTVCondition($tmp);
$this->query->having($having);
-
- $condition = [];
- foreach ($having as $k => $v) {
- if (is_array($v)) {
- $condition[] = $k . '(' . implode(',', $v) . ')';
- } else {
- $condition[] = $k . '=' . $v;
- }
- }
- $this->addTime('Added having condition: ' . implode(', ', $condition) . '', microtime(true) - $time);
+ $havingLog = json_encode($having);
+ $this->addTime('Added having condition: ' . ($havingLog !== false ? $havingLog : print_r($having, true)) . ' ', microtime(true) - $time);
}
}