Browse Source

Cleanup database logic a bit

tags/v4.1.0
Timothy Warren 1 year ago
parent
commit
1c3b478d49
2 changed files with 9 additions and 8 deletions
  1. +9
    -2
      src/Model/Collection.php
  2. +0
    -6
      src/Model/DB.php

+ 9
- 2
src/Model/Collection.php View File

@@ -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;
}
}


+ 0
- 6
src/Model/DB.php View File

@@ -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…
Cancel
Save