adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-04-01 06:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restoring previous patch to DboMssql

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7580 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-09-09 05:41:51 +00:00
parent dbeb3af384
commit ee0e81406c
1 changed files with 2 additions and 3 deletions

5
cake/libs/model/datasources/dbo/dbo_mssql.php
View file

@ -546,9 +546,9 @@ class DboMssql extends DboSource {
$offset = intval($offset[1]) + intval($limitVal[1]); $offset = intval($offset[1]) + intval($limitVal[1]);
$rOrder = $this->__switchSort($order); $rOrder = $this->__switchSort($order);
list($order2, $rOrder) = array($this->__mapFields($order), $this->__mapFields($rOrder)); 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} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}"; return "SELECT * FROM (SELECT {$limit} * FROM (SELECT TOP {$offset} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}";
} else { } else {
return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$order}"; return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
} }
break; break;
case "schema": case "schema":
@ -566,7 +566,6 @@ class DboMssql extends DboSource {
${$var} = "\t" . join(",\n\t", array_filter(${$var})); ${$var} = "\t" . join(",\n\t", array_filter(${$var}));
} }
} }
echo "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}"; return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
break; break;
default: default: