Subversion Repositories PHPX

Compare Revisions

Last modification

Ignore whitespace Rev 33 → Rev 32

/trunk/Db/Database.php
1,6 → 1,7
<?php
 
require_once __DIR__ . '/../global.inc';
 
require_once __DIR__ . '/../AbstractModel.php';
 
/**
273,7 → 274,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}";
352,7 → 353,7
$columns = $this->_escapeAliasArray($columns);
}
 
$columns = implode(', ', $columns);
$columns = implode(',', $columns);
}
 
if (is_array($tables))
362,7 → 363,7
$columns = $this->_escapeAliasArray($columns);
}
 
$tables = implode(', ', $tables);
$tables = implode(',', $tables);
}
 
$query = "SELECT {$columns} FROM {$tables}" . $this->_where($where);
371,7 → 372,7
{
if (is_array($order))
{
$order = 'ORDER BY ' . implode(', ', $order);
$order = 'ORDER BY ' . implode(',', $order);
}
$query .= " $order";
485,7 → 486,7
if (is_array($tables))
{
$tables = implode(', ', $tables);
$tables = implode(',', $tables);
}
if (!$updates)
503,7 → 504,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');
593,7 → 594,7
{
$cols = ' ('
. (is_array($cols)
? implode(', ', array_map(array($this, 'escapeName'), $cols))
? implode(',', array_map(create_function('$s', 'return "`$s`";'), $cols))
: $cols) . ')';
}
else
738,7 → 739,7
if (is_array($tables))
{
$tables = implode(', ', $tables);
$tables = implode(',', $tables);
}
$params = array();