From 78e28dc461297ee08e692fff9638e2da48b8e7df Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 25 Feb 2015 14:23:25 +0000 Subject: [PATCH] More PgSQL query fixes (still not complete) --- src/Models/Metric.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Models/Metric.php b/src/Models/Metric.php index 6ba7cea2..99cb3c85 100644 --- a/src/Models/Metric.php +++ b/src/Models/Metric.php @@ -78,7 +78,11 @@ class Metric extends Model implements TransformableInterface if (Config::get('database.default') === 'mysql') { $value = (int) $this->points()->whereRaw('DATE_FORMAT(created_at, "%Y%c%e%H") = '.$dateTime->format('YmdH'))->whereRaw('HOUR(created_at) = HOUR(DATE_SUB(NOW(), INTERVAL '.$hour.' HOUR))')->groupBy(DB::raw('HOUR(created_at)'))->sum('value'); } else { - $value = (int) $this->points()->whereRaw('to_char(created_at, "YYYYMMDDHH") = "'.$dateTime->format('YmdH').'"')->whereRaw('DATE_PART("hour", created_at) = DATE_PART("hour", NOW() - INTERVAL "'.$hour.' hour")')->groupBy(DB::raw('DATE_PART("hour", created_at)'))->sum('value'); + if ($hour === 0) { + $value = (int) $this->points()->whereRaw('to_char(created_at, "YYYYMMDDHH") = "'.$dateTime->format('ymdh').'"')->whereRaw('date_part("hour", created_at) = date_part("hour", now())')->groupBy(DB::raw('date_part("hour", created_at)'))->sum('value'); + } else { + $value = (int) $this->points()->whereRaw('to_char(created_at, "YYYYMMDDHH") = "'.$dateTime->format('ymdh').'"')->whereRaw('date_part("hour", created_at) = date_part("hour", now() - interval "'.$hour.' hour")')->groupBy(DB::raw('date_part("hour", created_at)'))->sum('value'); + } } if ($value === 0 && $this->default_value != $value) {