UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 17:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fix grouping error in PostgreSQL
This commit is contained in:
daniel 2021-11-10 21:53:30 -07:00 committed by GitHub
commit 59d76bb9b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Services/AdminStatsService.php
View file

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