- Fixed the merge

This commit is contained in:
Dave Mc Nicoll 2022-04-13 13:12:00 +00:00
parent 325704260b
commit 486077b2d4
4 changed files with 15 additions and 3 deletions

View File

@ -23,8 +23,8 @@ interface AdapterInterface {
/* public function databaseName() : string;
public function mapFieldType(FieldDefinition $field) : string;
public function schemaTable(string $databaseName, string $tableName) /*: object|EntityCollection
*/
public function repositoryClass() : string;
public function queryBuilderClass() : string;
public function tableSyntax() : array; */
public function tableSyntax() : array;
}

View File

@ -229,4 +229,10 @@ class MsSQL implements AdapterInterface {
{
return null;
}
public function repositoryClass() : string
{
return Repository\MssqlRepository::class;
}
}

View File

@ -39,6 +39,8 @@ class Join extends Fragment
public int $order = 40;
public const ORDER_VALUE = 0;
public int $joinOrder = 0;
public function __construct(QueryBuilderInterface $queryBuilder)

View File

@ -43,7 +43,7 @@ class MssqlRepository extends Repository {
protected function finalizeQuery() : void
{
if ( null !== $offset = $this->queryBuilder->getFragment(Query\MsSQL\Offset::class) ) {
if ( null !== $offset = $this->queryBuilder->getFragment(Query\Offset::class) ) {
# an order by is mandatory for mssql offset/limit
if ( null === $order = $this->queryBuilder->getFragment(Query\OrderBy::class) ) {
$this->orderBy("(SELECT 0)");
@ -62,6 +62,10 @@ class MssqlRepository extends Repository {
throw new \Exception("Your offset query fragment is missing a LIMIT value.");
}
}
if ( null !== $limit = $this->queryBuilder->getFragment(Query\Limit::class) ) {
$this->queryBuilder->removeFragment($limit);
}
}
protected function serverRequestCountRepository() : Repository