Permalink
Browse files

Fixing FormAuthenticateTest for Sqlsrv

  • Loading branch information...
1 parent f1108b2 commit a34358faa43c9578fa47bdc08ef237bc2e96e246 @lorenzo lorenzo committed Jun 21, 2011
@@ -517,20 +517,7 @@ 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));
- $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;
+ return "SELECT * FROM (SELECT {$limit} * FROM (SELECT TOP {$offset} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}";
} else {
return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
}
@@ -245,7 +245,7 @@ public function testCakeAdmin() {
$this->assertTrue($result);
$this->assertEqual(Configure::read('Routing.prefixes'), array('my_prefix'));
- $file->delete();
+ @$file->delete();
}
/**
@@ -44,7 +44,8 @@ public function setUp() {
'userModel' => 'User'
));
$password = Security::hash('password', null, true);
- ClassRegistry::init('User')->updateAll(array('password' => '"' . $password . '"'));
+ $User = ClassRegistry::init('User');
+ $User->updateAll(array('password' => $User->getDataSource()->value($password)));
$this->response = $this->getMock('CakeResponse');
}

0 comments on commit a34358f

Please sign in to comment.