- Fixed MsSQL entity and searchRequest which caused buggy searchs

This commit is contained in:
Dave Mc Nicoll 2026-06-19 19:44:41 +00:00
parent 1e4a528d39
commit 5d32d9f635
3 changed files with 111 additions and 2 deletions

View File

@ -20,8 +20,9 @@ class Table extends \Ulmus\Entity\InformationSchema\Table
$adapter = Ulmus::$registeredAdapters[$this->loadedFromAdapter];
return Column::repository(Repository\MssqlRepository::DEFAULT_ALIAS, $adapter)
->where(Column::field('tableName'), $this->name )
->and(Column::field('tableSchema'), $this->schema )
->select('*')
->where('TABLE_NAME', $this->name )
->and('TABLE_SCHEMA', $this->schema )
->loadAll();
}
}

View File

@ -0,0 +1,107 @@
<?php
namespace Ulmus\SearchRequest;
use Psr\Http\Message\ServerRequestInterface;
use Ulmus\Repository;
trait DeprecatedSearchRequestFormatTrait
{
protected array $wheres = [];
protected array $wheresConditions = [];
protected array $wheresOperators = [];
protected array $likes = [];
protected array $likesOperators = [];
protected array $likesConditions = [];
protected array $groups = [];
protected array $orders = [];
/* [[ Boilerplates which are ready to be copied */
public function wheres() : iterable
{
return array_filter($this->wheres + [
], fn($i) => ! is_null($i) ) + [ ];
}
public function wheresConditions() : iterable
{
return array_filter($this->wheresConditions + [
], fn($i) => ! is_null($i) ) + [ ];
}
public function wheresOperators() : iterable
{
return array_filter($this->wheresOperators + [
], fn($i) => ! is_null($i) ) + [ ];
}
public function likes(): iterable
{
return array_filter($this->likes + [
], fn($i) => ! is_null($i) ) + [];
}
public function likesConditions() : iterable
{
return array_filter($this->likesConditions + [
], fn($i) => ! is_null($i) ) + [ ];
}
public function likesOperators() : iterable
{
return array_filter($this->likesOperators + [
], fn($i) => ! is_null($i) ) + [ ];
}
public function groups(): iterable
{
return array_filter($this->groups + [
], fn($e) => ! is_null($e) && $e !== "" );
}
public function orders(): iterable
{
return array_filter($this->orders + [
], fn($e) => ! is_null($e) && $e !== "" );
}
public function applyCount(Repository\RepositoryInterface $repository): SearchRequestInterface
{
$this->count = $this->filter($repository)
->wheres($this->wheres(), $this->wheresOperators(), $this->wheresConditions())
->likes($this->likes(), $this->likesConditions())
->groups($this->groups())
->count();
return $this;
}
public function apply(Repository\RepositoryInterface $repository): SearchRequestInterface
{
$this->filter($repository)
->wheres($this->wheres(), $this->wheresOperators(), $this->wheresConditions())
->likes($this->likes(), $this->likesConditions())
->orders($this->orders())
->groups($this->groups())
->offset($this->offset())
->limit($this->limit());
return $this;
}
/* ]] */
}

View File

@ -5,6 +5,7 @@ namespace Ulmus\SearchRequest;
use Ulmus\Repository;
trait SearchRequestPaginationTrait {
use DeprecatedSearchRequestFormatTrait;
public int $count = 0;