- Fixed conflicts

src/Repository/MssqlRepository.php

@@ -5,7 +5,7 @@ namespace Ulmus\Repository;
 use Ulmus\{Repository, Query, Ulmus, Common};
 
 class MssqlRepository extends Repository {
-
+/*
     protected function finalizeQuery() : void
     {
         if ( null !== $offset = $this->queryBuilder->getFragment(Query\Offset::class) ) {
@@ -39,6 +39,30 @@ class MssqlRepository extends Repository {
             $this->queryBuilder->removeFragment($limit);
         }
     }
+*/
+
+    protected function finalizeQuery() : void
+    {
+        if ( null !== $offset = $this->queryBuilder->getFragment(Query\MsSQL\Offset::class) ) {
+            # an order by is mandatory for mssql offset/limit
+            if ( null === $order = $this->queryBuilder->getFragment(Query\OrderBy::class) ) {
+                $this->orderBy("(SELECT 0)");
+            }
+
+            if ( empty ($offset->offset ) ) {
+                if ( null !== $select = $this->queryBuilder->getFragment(Query\Select::class) ) {
+                    $select->top = $offset->limit;
+                }
+                elseif ( null !== $delete = $this->queryBuilder->getFragment(Query\Delete::class) ) {
+                    $delete->top = $offset->limit;
+                }
+                $this->queryBuilder->removeFragment($offset);
+            }
+            elseif ( empty($offset->limit) ) {
+                throw new \Exception("Your offset query fragment is missing a LIMIT value.");
+            }
+        }
+    }
 
     protected function serverRequestCountRepository() : Repository
     {