From a97ce31e3e0e4e419870d45e676ef470b8324715 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 10 Feb 2014 21:44:37 +0100
Subject: [PATCH] Added missing methods to interface and added newly one to
 class.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../middleware/class_DatabaseConnector.php    | 80 +++++++++++++++++++
 .../database/class_DatabaseConnection.php     | 11 +++
 2 files changed, 91 insertions(+)

diff --git a/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php b/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php
index 4620df82..aa633f06 100644
--- a/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php
@@ -22,6 +22,86 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface DatabaseConnector extends FrameworkDatabase {
+	/**
+	 * Get an instance of this class (Singleton)
+	 *
+	 * @return	$selfInstance	An instance of this class
+	 */
+	function getSelfInstance ();
+
+	/**
+	 * Setter for database connection
+	 *
+	 * @param	$login	Login to database
+	 * @param	$pass	Password (plain)
+	 * @param	$dbase	Database to choose
+	 * @param	$host	Hostname to use
+	 * @return	void
+	 */
+	function setConnectionData ($login, $pass, $dbase, $host='localhost');
+
+	/**
+	 * Getter for connection data
+	 *
+	 * @return	$connectData	Connection data stored with this clas
+	 */
+	function getConnectionData ();
+
+	/**
+	 * Setter for the real database layer
+	 * @param	$dbLayer	An instance of the real database layer
+	 * @return	void
+	 */
+	function setDatabaseLayer (DatabaseBackend $dbLayer);
+
+	/**
+	 * Getter for index key
+	 *
+	 * @return	$indexKey	Index key
+	 */
+	function getIndexKey ();
+
+	/**
+	 * Runs a 'select' statement on the database layer with given table name
+	 * and criteria. If this doesn't fail the result will be returned
+	 *
+	 * @param	$tableName			Name of the 'table' we shall query
+	 * @param	$criteriaInstance	An instance of a Criteria class
+	 * @return	$result				The result as an array
+	 */
+	function doSelectByTableCriteria ($tableName, Criteria $criteriaInstance);
+
+	/**
+	 * Getter for last exception
+	 *
+	 * @return	$exceptionInstance	Last thrown exception
+	 */
+	function getLastException ();
+
+	/**
+	 * 'Inserts' a data set instance into a local file database folder
+	 *
+	 * @param	$dataSetInstance	A storeable data set
+	 * @return	void
+	 */
+	function queryInsertDataSet (StoreableCriteria $dataSetInstance);
+
+	/**
+	 * 'Updates' a data set instance with a database layer
+	 *
+	 * @param	$dataSetInstance	A storeable data set
+	 * @return	void
+	 */
+	function queryUpdateDataSet (StoreableCriteria $dataSetInstance);
+
+	/**
+	 * Getter for primary key column of specified table name
+	 *
+	 * @param	$tableName		Name of table we need the primary key column from
+	 * @return	$primaryKey		Primary key column of requested table
+	 */
+	function getPrimaryKeyOfTable ($tableName);
+
 	/**
 	 * Removes non-public data from given array.
 	 *
diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index 318073c8..dd4ce325 100644
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -177,6 +177,17 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 		// Return the value
 		return $primaryKey;
 	}
+
+	/**
+	 * Removes non-public data from given array.
+	 *
+	 * @param	$data	An array with possible non-public data that needs to be removed.
+	 * @return	$data	A cleaned up array with only public data.
+	 */
+	public function removeNonPublicDataFromArray (array $data) {
+		// Call database backend
+		return $this->dbLayer->removeNonPublicDataFromArray($data);
+	}
 }
 
 // [EOF]
-- 
2.30.2