Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix segment and newsletter listing SQL to work with ONLY_FULL_GROUP_BY

Browse Source 
[MAILPOET-3115]
This commit is contained in:
Rostislav Wolny
2020-08-26 10:15:16 +02:00
committed by Veljko V
parent d89e68fd2c
commit 5550f5eef2
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Models/Segment.php
View File

@@ -268,6 +268,7 @@ class Segment extends Model {
[MP_SUBSCRIBER_SEGMENT_TABLE . '.subscriber_id', '=', MP_SUBSCRIBERS_TABLE . '.id']) [MP_SUBSCRIBER_SEGMENT_TABLE . '.subscriber_id', '=', MP_SUBSCRIBERS_TABLE . '.id'])
->groupBy(self::$_table . '.id') ->groupBy(self::$_table . '.id')
->groupBy(self::$_table . '.name') ->groupBy(self::$_table . '.name')
->groupBy(self::$_table . '.type')
->orderByAsc(self::$_table . '.name') ->orderByAsc(self::$_table . '.name')
->whereNull(self::$_table . '.deleted_at'); ->whereNull(self::$_table . '.deleted_at');

1
lib/Newsletter/Listing/NewsletterListingRepository.php
View File

@@ -51,6 +51,7 @@ class NewsletterListingRepository extends ListingRepository {
->join('n.newsletterSegments', 'ns') ->join('n.newsletterSegments', 'ns')
->join('ns.segment', 's') ->join('ns.segment', 's')
->groupBy('s.id') ->groupBy('s.id')
->addGroupBy('s.name')
->orderBy('s.name') ->orderBy('s.name')
->having('COUNT(n) > 0'); ->having('COUNT(n) > 0');