Skip to content

Commit 44ff839

Browse files
committed
unbreak group by queries
1 parent 77c8f00 commit 44ff839

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lib/Db/ReportItemMapper.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
5252
$selectFields[] = '\'*\' as "details"';
5353
}
5454

55-
5655
if (!$aggregation) {
5756
$selectFields[]= "start as time";
5857
} else {
@@ -66,8 +65,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
6665
$selectFields[]= "date_part('year', to_timestamp(start)) as ftime";
6766
}elseif ($timegroup == 'month') {
6867
$selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as ftime";
69-
}else {
70-
$selectFields[]= "min(start) as ftime";
68+
} else if (!empty($timegroup)){
69+
$selectFields[]= "start as ftime";
7170
}
7271
} else if ($this->dbengine == 'SQLITE') {
7372
if ($timegroup == 'week') {
@@ -76,8 +75,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
7675
$selectFields[]= "strftime('%Y', datetime(start, 'unixepoch')) as ftime";
7776
}elseif ($timegroup == 'month') {
7877
$selectFields[]= "strftime('%Y-%m', datetime(start, 'unixepoch')) as ftime";
79-
}else {
80-
$selectFields[]= "min(start) as ftime";
78+
} else if (!empty($timegroup)){
79+
$selectFields[]= "start as ftime";
8180
}
8281
} else {
8382
if ($timegroup == 'week') {
@@ -86,8 +85,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
8685
$selectFields[]= "YEAR(FROM_UNIXTIME(start)) as ftime";
8786
}elseif ($timegroup == 'month') {
8887
$selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as ftime";
89-
}else {
90-
$selectFields[]= "min(start) as ftime";
88+
} else if (!empty($timegroup)){
89+
$selectFields[]= "start as ftime";
9190
}
9291
}
9392

0 commit comments

Comments
 (0)