Browse Source

Merge pull request #2956 from h3xx/fix-psql-grouping

Fix grouping error in PostgreSQL
daniel 3 năm trước cách đây
mục cha
commit
59d76bb9b3
1 tập tin đã thay đổi với 3 bổ sung3 xóa
  1. 3 3
      app/Services/AdminStatsService.php

+ 3 - 3
app/Services/AdminStatsService.php

@@ -68,8 +68,8 @@ class AdminStatsService
 	{
 		$ttl = now()->addHours(12);
 		return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function() {
-			$gb = config('database.default') == 'pgsql' ? ['statuses.id', DB::raw('Date(created_at)')] : DB::raw('Date(created_at)');
-			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
+			$gb = config('database.default') == 'pgsql' ? ['statuses.id', 'created_at'] : DB::raw('Date(created_at)');
+			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
 				->where('created_at', '>=', now()->subWeek())
 				->groupBy($gb)
 				->orderBy('created_at', 'DESC')
@@ -86,7 +86,7 @@ class AdminStatsService
 
 			$dates = collect($dates)->merge($s);
 
-			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*')
+			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
 				->where('created_at', '>=', now()->subWeeks(2))
 				->where('created_at', '<=', now()->subWeeks(1))
 				->groupBy($gb)