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

Fixing DboMssql::buildColumn() to correct columns being created with incorrect null constraints, fixes #5373, fixes #5381

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7577 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-09-09 05:23:11 +00:00
parent 8e546b23b8
commit 0b227e6c24
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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]);
$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}";
return "SELECT * FROM (SELECT {$limit} * FROM (SELECT TOP {$offset} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}";
} else {
return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$order}";
}
break;
case "schema":
@ -566,6 +566,7 @@ class DboMssql extends DboSource {
${$var} = "\t" . join(",\n\t", array_filter(${$var}));
}
}
echo "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
break;
default:
@ -649,8 +650,10 @@ class DboMssql extends DboSource {
(array_key_exists('default', $column) && $column['default'] === null) ||
(array_keys($column) == array('type', 'name'))
);
$stringKey = (isset($column['key']) && $column['key'] == 'primary' && $column['type'] != 'integer');
if ($null) {
$primaryKey = (isset($column['key']) && $column['key'] == 'primary');
$stringKey = ($primaryKey && $column['type'] != 'integer');
if ($null && !$primaryKey) {
$result .= " NULL";
}
return $result;