mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-06 00:14:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use natural sorting for trees and others repository functions

Browse source
This commit is contained in:
Jan Böhmer 2024-06-17 22:33:40 +02:00
parent 9db822eabd
commit 8bb8118d9f
13 changed files with 71 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Doctrine/Functions/Natsort.php
View file

@ -25,6 +25,7 @@ namespace App\Doctrine\Functions;
use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver;
use Doctrine\DBAL\Platforms\MariaDBPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\AST\Node;
use Doctrine\ORM\Query\Parser;
@ -33,7 +34,7 @@ use Doctrine\ORM\Query\TokenType;
class Natsort extends FunctionNode
{
private Node $field;
private ?Node $field = null;
public function parse(Parser $parser): void
{
@ -47,15 +48,17 @@ class Natsort extends FunctionNode
public function getSql(SqlWalker $sqlWalker): string
{
assert($this->field !== null, 'Field is not set');
$platform = $sqlWalker->getConnection()->getDatabasePlatform();
if ($platform instanceof AbstractPostgreSQLDriver) {
if ($platform instanceof PostgreSQLPlatform) {
return $this->field->dispatch($sqlWalker) . ' COLLATE numeric';
}
if ($platform instanceof MariaDBPlatform && $sqlWalker->getConnection()->getServerVersion()) {
/*if ($platform instanceof MariaDBPlatform && $sqlWalker->getConnection()->getServerVersion()) {
}
}*/
//For every other platform, return the field as is
return $this->field->dispatch($sqlWalker);