adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1628 from ravage84/sqlserver-elseif

Browse source 
Replaced two elseifs by if in sqlserver datasource
This commit is contained in:
Mark Story 2013-09-11 16:22:46 -07:00
commit 8f2bd51834
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Datasource/Database/Sqlserver.php
View file

@ -538,7 +538,8 @@ class Sqlserver extends DboSource {
WHERE _cake_paging_.{$rowCounter} > {$offset} WHERE _cake_paging_.{$rowCounter} > {$offset}
ORDER BY _cake_paging_.{$rowCounter} ORDER BY _cake_paging_.{$rowCounter}
"; ";
} elseif (strpos($limit, 'FETCH') !== false) { }
if (strpos($limit, 'FETCH') !== false) {
return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}"; return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
} }
return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}"; return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
@ -573,7 +574,8 @@ class Sqlserver extends DboSource {
public function value($data, $column = null) { public function value($data, $column = null) {
if ($data === null || is_array($data) || is_object($data)) { if ($data === null || is_array($data) || is_object($data)) {
return parent::value($data, $column); return parent::value($data, $column);
} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) { }
if (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
return $data; return $data;
} }