- Fixed the merge

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

No files matched your search

+5 -1
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