Subversion Repositories PHPX

Compare Revisions

Last modification

Ignore whitespace Rev 51 → Rev 50

/trunk/Db/Database.php
1,7 → 1,5
<?php
 
namespace PointedEars\PHPX\Db;
 
require_once __DIR__ . '/../global.inc';
require_once __DIR__ . '/../AbstractModel.php';
 
23,7 → 21,7
* Last success value of the database operation
* @author Thomas Lahn
*/
class Database extends \PointedEars\PHPX\AbstractModel
class Database extends AbstractModel
{
/* Access properties */
 
191,7 → 189,7
if ($this->_connection === null)
{
$this->_connection =
new \PDO($this->_dsn, $this->_username, $this->_password, $this->_options);
new PDO($this->_dsn, $this->_username, $this->_password, $this->_options);
}
 
return $this->_connection;
481,7 → 479,7
* @see PDOStatement::fetchAll()
*/
public function select($tables, $columns = null, $where = null,
$order = null, $limit = null, $fetch_style = \PDO::FETCH_ASSOC)
$order = null, $limit = null, $fetch_style = PDO::FETCH_ASSOC)
{
if (is_null($columns))
{
841,7 → 839,7
 
if (is_null($fetch_style))
{
$fetch_style = \PDO::FETCH_ASSOC;
$fetch_style = PDO::FETCH_ASSOC;
}
 
if (!is_null($ctor_args))