Cleanup database logic a bit
This commit is contained in:
parent
b66a35843d
commit
317d8fd29b
@ -25,6 +25,12 @@ use PDOException;
|
||||
*/
|
||||
class Collection extends DB {
|
||||
|
||||
/**
|
||||
* The query builder object
|
||||
* @var \Query\Query_Builder_Interface
|
||||
*/
|
||||
protected $db;
|
||||
|
||||
/**
|
||||
* Whether the database is valid for querying
|
||||
* @var boolean
|
||||
@ -43,6 +49,7 @@ class Collection extends DB {
|
||||
try
|
||||
{
|
||||
$this->db = \Query($this->dbConfig);
|
||||
$this->validDatabase = TRUE;
|
||||
}
|
||||
catch (PDOException $e) {}
|
||||
|
||||
@ -62,9 +69,9 @@ class Collection extends DB {
|
||||
$this->validDatabase = FALSE;
|
||||
}
|
||||
}
|
||||
else
|
||||
else if ($this->db === NULL)
|
||||
{
|
||||
$this->validDatabase = TRUE;
|
||||
$this->validDatabase = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -24,12 +24,6 @@ use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
|
||||
class DB {
|
||||
use ContainerAware;
|
||||
|
||||
/**
|
||||
* The query builder object
|
||||
* @var \Query\Query_Builder_Interface
|
||||
*/
|
||||
protected $db;
|
||||
|
||||
/**
|
||||
* The database connection information array
|
||||
* @var array $dbConfig
|
||||
|
Loading…
Reference in New Issue
Block a user