remove cursored pagination as default since this only works for order queries on a unique field

Author: gertvdb

lib/vendor/creole/drivers/mssqlsrv/MSSQLSRVConnection.php

@@ -126,14 +126,14 @@ public function createStatement()
    */
   public function applyLimit(&$sql, $offset, $limit)
   {
-    if($limit > 0)
-    {
-      $sql .= ' offset ' . ($offset?: 0) . ' rows ';
-      $sql .= ' fetch next ' . $limit . ' rows only ';
-    }
-    else if($offset > 0) {
-      $sql .= ' offset ' . ($offset?: 0) . ' rows ';
-    }
+      // MSSQL doesn't support this method.
+      // It could however do a 'cursor' based query.
+      // The only problem is you can not do this in a generic way
+      // since a cursor query requires an order by clause on a unique table.
+      // (ex. "name" is not unique so applying this by default would break the query)
+
+      // Therefor we don't apply this method anymore until we have a way of letting the
+      // query itself pass to this method if it can use cursor query.
   }
 
   /**

lib/vendor/creole/drivers/mssqlsrv/MSSQLSRVPreparedStatement.php

@@ -61,44 +61,27 @@ protected function escape($subject)
    */
   public function executeQuery($p1 = null, $fetchmode = null)
   {
-    $params = null;
-    if ($fetchmode !== null) {
-      $params = $p1;
-    } elseif ($p1 !== null) {
-      if (is_array($p1)) $params = $p1;
-      else $fetchmode = $p1;
-    }
-
-    if ($params) {
-      for($i=0,$cnt=count($params); $i < $cnt; $i++) {
-        $this->set($i+1, $params[$i]);
+      $params = null;
+      if ($fetchmode !== null) {
+          $params = $p1;
+      } elseif ($p1 !== null) {
+          if (is_array($p1)) $params = $p1;
+          else $fetchmode = $p1;
       }
-    }
-
-    $this->updateCount = null; // reset
-    $sql = $this->replaceParams();
-
-    if(stripos($sql, 'ORDER BY'))
-      $offsetBefore = true;
-    else
-      $offsetBefore = false;
 
-    if($offsetBefore)
-    {
-      if ($this->limit > 0 || $this->offset > 0) {
-        $this->conn->applyLimit($sql, $this->offset, $this->limit);
+      if ($params) {
+          for($i=0,$cnt=count($params); $i < $cnt; $i++) {
+              $this->set($i+1, $params[$i]);
+          }
       }
-    }
 
-    $this->resultSet = $this->conn->executeQuery($sql, $fetchmode);
+      $this->updateCount = null; // reset
+      $sql = $this->replaceParams();
 
-    if(!$offsetBefore)
-    {
+      $this->resultSet = $this->conn->executeQuery($sql, $fetchmode);
       $this->resultSet->_setOffset($this->offset);
       $this->resultSet->_setLimit($this->limit);
-    }
-
-    return $this->resultSet;
+      return $this->resultSet;
   }
 
   /**

lib/vendor/creole/drivers/mssqlsrv/MSSQLSRVResultSet.php

@@ -87,7 +87,7 @@ function seek($rownum)
       return false;
     }
 
-    if (($this->limit > 0 && $rownum >= $this->limit) || $rownum < 0) {
+    if (($this->limit > 0 && $rownum >= $this->limit)) {
       // have to check for rownum < 0, because mssql_seek() won't
       // complain if the $actual is valid.
       return false;
@@ -96,7 +96,7 @@ function seek($rownum)
     // MSSQL rows start w/ 0, but this works, because we are
     // looking to move the position _before_ the next desired position
     if (!sqlsrv_fetch($this->result, SQLSRV_SCROLL_ABSOLUTE, $rownum + $this->offset)) {
-        return false;
+      return false;
     }
 
     $this->cursorPos = $rownum;

lib/vendor/propel/adapter/DBMSSQL.php

@@ -38,6 +38,8 @@ class DBMSSQL extends DBSybase {
     */
     public function applyLimit(&$sql, $offset, $limit)
     {
+
+
         // make sure offset and limit are numeric
         if(!is_numeric($offset) || !is_numeric($limit)){
             throw new Exception("DBMSSQL ::applyLimit() expects a number for argument 2 and 3");