Reverting testing changes pushed in past commit

cakephp · Jun 21, 2011 · 3d2a732 · 3d2a732
1 parent e14c441
commit 3d2a732
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -517,7 +517,20 @@ public function renderStatement($type, $data) {
 					$offset = intval($offset[1]) + intval($limitVal[1]);
 					$rOrder = $this->__switchSort($order);
 					list($order2, $rOrder) = array($this->__mapFields($order), $this->__mapFields($rOrder));
-					return "SELECT * FROM (SELECT {$limit} * FROM (SELECT TOP {$offset} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}";
+					$limit2 = str_replace('TOP', '', $limit);
+					if (!$order) {
+						$order = 'ORDER BY (SELECT NULL)';
+					}
+
+					$pagination = "
+						SELECT {$limit} * FROM (
+							SELECT {$fields}, ROW_NUMBER() OVER ({$order}) AS ssma\$rownum
+							FROM {$table} {$alias} {$joins} {$conditions} {$group}
+						) AS ssma\$sub1
+						WHERE ssma\$sub1.[ssma\$rownum] > {$limit2}
+						ORDER BY ssma\$sub1.[ssma\$rownum]
+					";
+					return $pagination;
 				} else {
 					return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
 				}

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
@@ -245,7 +245,7 @@ public function testCakeAdmin() {
 		$this->assertTrue($result);
 
 		$this->assertEqual(Configure::read('Routing.prefixes'), array('my_prefix'));
-		@$file->delete();
+		$file->delete();
 	}
 
 /**