|
|
@@ -530,19 +530,19 @@ class Sqlserver extends DboSource {
|
|
|
$offset = intval($limitOffset[2] * $page);
|
|
|
|
|
|
$rowCounter = self::ROW_COUNTER;
|
|
|
- return "
|
|
|
- SELECT {$limit} * FROM (
|
|
|
+ $sql = "SELECT {$limit} * FROM (
|
|
|
SELECT {$fields}, ROW_NUMBER() OVER ({$order}) AS {$rowCounter}
|
|
|
FROM {$table} {$alias} {$joins} {$conditions} {$group}
|
|
|
) AS _cake_paging_
|
|
|
WHERE _cake_paging_.{$rowCounter} > {$offset}
|
|
|
ORDER BY _cake_paging_.{$rowCounter}
|
|
|
";
|
|
|
+ return trim($sql);
|
|
|
}
|
|
|
if (strpos($limit, 'FETCH') !== false) {
|
|
|
- return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
|
|
|
+ return trim("SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}");
|
|
|
}
|
|
|
- return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
|
|
|
+ return trim("SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}");
|
|
|
case "schema":
|
|
|
extract($data);
|
|
|
|
|
|
@@ -558,7 +558,7 @@ class Sqlserver extends DboSource {
|
|
|
${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
|
|
|
}
|
|
|
}
|
|
|
- return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
|
|
|
+ return trim("CREATE TABLE {$table} (\n{$columns});\n{$indexes}");
|
|
|
default:
|
|
|
return parent::renderStatement($type, $data);
|
|
|
}
|