adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-04 02:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing code formatting in DBOs

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3668 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-10-14 17:21:28 +00:00
parent 3a03674c76
commit 8b23234b53
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ class DboMssql extends DboSource {
$fields[$i] = $this->name($alias) . '.' . $this->name($fields[$i]) . ' AS ' . $this->name($alias . '__' . $fields[$i]);
} else {
$build = explode('.', $fields[$i]);
$fields[$i]=$this->name($build[0]) . '.' . $this->name($build[1]) . ' AS ' . $this->name($build[0] . '__' . $build[1]);
$fields[$i] = $this->name($build[0]) . '.' . $this->name($build[1]) . ' AS ' . $this->name($build[0] . '__' . $build[1]);
}
}
}
@ -523,12 +523,12 @@ class DboMssql extends DboSource {
$j = 0;
while($j < $num_fields) {
$column = mssql_fetch_field($results, $j);
$column = mssql_field_name($results, $j);
if (strpos($column->name, '__')) {
$this->map[$index++] = explode('__', $column->name);
if (strpos($column, '__')) {
$this->map[$index++] = explode('__', $column);
} else {
$this->map[$index++] = array(0, $column->name);
$this->map[$index++] = array(0, $column);
}
$j++;
@ -547,7 +547,7 @@ class DboMssql extends DboSource {
foreach($row as $index => $field) {
list($table, $column) = $this->map[$index];
$resultRow[$table][$column]=$row[$index];
$resultRow[$table][$column] = $row[$index];
$i++;
}

3
cake/libs/model/datasources/dbo/dbo_mysql.php
View file

@ -348,8 +348,7 @@ class DboMysql extends DboSource {
function column($real) {
if (is_array($real)) {
$col = $real['name'];
if (isset($real['limit']))
{
if (isset($real['limit'])) {
$col .= '('.$real['limit'].')';
}
return $col;