Правки namespace

This commit is contained in:
CORP\phedor 2018-04-13 17:59:57 +03:00
parent ee06f1febb
commit 524b27936a
39 changed files with 141 additions and 120 deletions

View file

@ -12,6 +12,7 @@ namespace {
namespace ctiso {
use PDO,
ctiso\Database\Statement,
ctiso\Database\PDOStatement,
ctiso\Database\IdGenerator;
/**
@ -61,7 +62,7 @@ class Database extends PDO
public function executeQuery($query, $values=null)
{
/*.Database_PDOStatement.*/$stmt = $this->prepare($query);
/*.PDOStatement.*/$stmt = $this->prepare($query);
$stmt->execute($values);
$stmt->cache = $stmt->fetchAll(PDO::FETCH_ASSOC);
@ -79,7 +80,7 @@ class Database extends PDO
*/
public function fetchAllArray($query, $values = null)
{
/*.Database_PDOStatement.*/$sth = $this->prepare($query);
/*.PDOStatement.*/$sth = $this->prepare($query);
$prep = $this->prepareValues($values);
$sth->execute($prep);
return $sth->fetchAll(PDO::FETCH_ASSOC);
@ -90,7 +91,7 @@ class Database extends PDO
*/
public function fetchOneArray($query, $values = null)
{
/*.Database_PDOStatement.*/$sth = $this->prepare($query);
/*.PDOStatement.*/$sth = $this->prepare($query);
$prep = $this->prepareValues($values);
$sth->execute($prep);
return $sth->fetch(PDO::FETCH_ASSOC);
@ -180,9 +181,12 @@ class Database extends PDO
return $result['nextval'];
}
function close()
{
function prepare($query) {
/*.PDOStatement.*/$result = $this->prepare($query);
return $result;
}
function close() {
return null;
}
}
}
}}