Subversion Repositories PHPX

Compare Revisions

Last modification

Ignore whitespace Rev 32 → Rev 33

/trunk/Db/Database.php
1,7 → 1,6
<?php
 
require_once __DIR__ . '/../global.inc';
 
require_once __DIR__ . '/../AbstractModel.php';
 
/**
274,7 → 273,7
if (is_array($value))
{
$placeholder = '(' . implode(',', self::_expand($value, $column)) . ')';
$placeholder = '(' . implode(', ', self::_expand($value, $column)) . ')';
}
$result[] = $this->_leftQuote . $column . $this->_rightQuote . "{$op}{$placeholder}{$suffix}";
353,7 → 352,7
$columns = $this->_escapeAliasArray($columns);
}
 
$columns = implode(',', $columns);
$columns = implode(', ', $columns);
}
 
if (is_array($tables))
363,7 → 362,7
$columns = $this->_escapeAliasArray($columns);
}
 
$tables = implode(',', $tables);
$tables = implode(', ', $tables);
}
 
$query = "SELECT {$columns} FROM {$tables}" . $this->_where($where);
372,7 → 371,7
{
if (is_array($order))
{
$order = 'ORDER BY ' . implode(',', $order);
$order = 'ORDER BY ' . implode(', ', $order);
}
$query .= " $order";
486,7 → 485,7
if (is_array($tables))
{
$tables = implode(',', $tables);
$tables = implode(', ', $tables);
}
if (!$updates)
504,7 → 503,7
}
}
$updates = implode(',', $this->_escapeValueArray($updates));
$updates = implode(', ', $this->_escapeValueArray($updates));
/* TODO: Should escape table names with escapeName(), but what about aliases? */
$query = "UPDATE {$tables} SET {$updates}" . $this->_where($where, '2');
594,7 → 593,7
{
$cols = ' ('
. (is_array($cols)
? implode(',', array_map(create_function('$s', 'return "`$s`";'), $cols))
? implode(', ', array_map(array($this, 'escapeName'), $cols))
: $cols) . ')';
}
else
739,7 → 738,7
if (is_array($tables))
{
$tables = implode(',', $tables);
$tables = implode(', ', $tables);
}
$params = array();