From 1c3b478d49ffa8e67bc34754e0f55304812dd7e7 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 7 Jan 2019 14:29:15 -0500
Subject: [PATCH] Cleanup database logic a bit

---
 src/Model/Collection.php | 11 +++++++++--
 src/Model/DB.php         |  6 ------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index f08e22db..6191b4b1 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -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;
 		}
 	}
 
diff --git a/src/Model/DB.php b/src/Model/DB.php
index 18ae114e..f66b71e3 100644
--- a/src/Model/DB.php
+++ b/src/Model/DB.php
@@ -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