Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Drivers/MySQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
class MySQL implements SqlDialectInterface
{
#[\Override]
public function groupConcat(string $fieldName, string $alias, ?string $orderBy): string
public function groupConcat(string $fieldName, string $alias, ?string $orderBy, bool $distinct = true): string
{
return ", GROUP_CONCAT($fieldName ORDER BY $orderBy SEPARATOR ';') as $alias ";
$distinctStr = $distinct ? 'DISTINCT ' : '';
return ", GROUP_CONCAT({$distinctStr}$fieldName ORDER BY $orderBy SEPARATOR ';') as $alias ";
}

#[\Override]
Expand Down
6 changes: 4 additions & 2 deletions src/Drivers/PgSQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
class PgSQL implements SqlDialectInterface
{
#[\Override]
public function groupConcat(string $fieldName, string $alias, ?string $orderBy): string
public function groupConcat(string $fieldName, string $alias, ?string $orderBy, bool $distinct = true): string
{
return ", array_to_string(array_agg($fieldName ORDER BY $orderBy), ';') $alias ";
$distinctStr = $distinct ? 'DISTINCT ' : '';
$orderField = $distinct ? $fieldName : ($orderBy ?? $fieldName);
return ", array_to_string(array_agg({$distinctStr}$fieldName ORDER BY $orderField), ';') $alias";
}

#[\Override]
Expand Down
5 changes: 3 additions & 2 deletions src/Drivers/SQLite.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
class SQLite implements SqlDialectInterface
{
#[\Override]
public function groupConcat(string $fieldName, string $alias, ?string $orderBy): string
public function groupConcat(string $fieldName, string $alias, ?string $orderBy, bool $distinct = true): string
{
return ", GROUP_CONCAT($fieldName,';') $alias ";
$distinctStr = $distinct ? 'DISTINCT ' : '';
return ", GROUP_CONCAT({$distinctStr}$fieldName, ';') $alias";
}

#[\Override]
Expand Down
2 changes: 1 addition & 1 deletion src/Interfaces/SqlDialectInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

interface SqlDialectInterface
{
public function groupConcat(string $fieldName, string $alias, ?string $orderBy): string;
public function groupConcat(string $fieldName, string $alias, ?string $orderBy, bool $distinct = true): string;
public function close(): string;
public function integer(string $field, string $default = "", bool $autoincrement = false, string $null = "NOT NULL"): string;
public function string(string $field, string $default = "", string $null = "NOT NULL"): string;
Expand Down
Loading