tnhfw / tnh-fw

core/classes/cache/ApcCache.php

Indentation +37 added lines, -37 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	class ApcCache implements CacheInterface{
 
@@ -39,15 +39,15 @@ 
 			}
 
 			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->logger = $logger;
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::ApcCache');
-	        }
+			 * instance of the Log class
+			 */
+			if(is_object($logger)){
+			  $this->logger = $logger;
+			}
+			else{
+				$this->logger =& class_loader('Log', 'classes');
+				$this->logger->setLogger('Library::ApcCache');
+			}
 		}
 
 		/**
@@ -87,13 +87,13 @@ 
 			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
 			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
-		    	return false;
-		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
-		    	return true;
-		    }
+				$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+				return false;
+			}
+			else{
+				$this->logger->info('Cache data saved for the key ['. $key .']');
+				return true;
+			}
 		}
 
 
@@ -112,7 +112,7 @@ 
 			}
 			else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
-	      		return apc_delete($key);
+		  		return apc_delete($key);
 			}
 			return false;
 		}
@@ -178,28 +178,28 @@ 
 		}
 
 		/**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
+		 * Return the Log instance
+		 * @return Log
+		 */
+		public function getLogger(){
+		  return $this->logger;
+		}
 
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
+		/**
+		 * Set the log instance
+		 * @param Log $logger the log object
+		 */
+		public function setLogger(Log $logger){
+		  $this->logger = $logger;
+		  return $this;
+		}
 		
 		/**
-		* Return the array of cache information
-		*
-		* @param string $key the cache key to get the cache information 
-		* @return array
-		*/
+		 * Return the array of cache information
+		 *
+		 * @param string $key the cache key to get the cache information 
+		 * @return array
+		 */
 		private function _getCacheInfo($key){
 			$caches = apc_cache_info('user');
 			if(! empty($caches['cache_list'])){

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,19 +33,19 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
 		}
@@ -55,21 +55,21 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$this->logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -82,16 +82,16 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$this->logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -103,15 +103,15 @@ 
 		 * @return boolean      true if the cache is deleted, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$this->logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key);
 			}
 			return false;
@@ -125,10 +125,10 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -136,7 +136,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -146,7 +146,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -154,14 +154,14 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$this->logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -173,7 +173,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 
@@ -181,7 +181,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -189,7 +189,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -200,12 +200,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
 	         */
 	        if(is_object($logger)){
 	          $this->logger = $logger;
-	        }
-	        else{
+	        } else{
 	            $this->logger =& class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
@@ -62,8 +61,7 @@ 
 			if($success === false){
 				$this->logger->info('No cache found for the key ['. $key .'], return false');
 				return false;
-			}
-			else{
+			} else{
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
 				if($cacheInfo){
@@ -89,8 +87,7 @@ 
 			if($result === false){
 		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
 		    	return false;
-		    }
-		    else{
+		    } else{
 		    	$this->logger->info('Cache data saved for the key ['. $key .']');
 		    	return true;
 		    }
@@ -109,8 +106,7 @@ 
 			if($cacheInfo === false){
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
 	      		return apc_delete($key);
 			}
@@ -135,8 +131,7 @@ 
 							'ttl' => $cacheInfos['ttl']
 							);
 				return $data;
-			}
-			else{
+			} else{
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -160,8 +155,7 @@ 
 			if(empty($cacheInfos['cache_list'])){
 				$this->logger->info('No cache data were found skipping');
 				return false;
-			}
-			else{
+			} else{
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}

core/classes/Database.php

Indentation +1223 added lines, -1223 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
   /**
    * TNH Framework
    *
@@ -22,183 +22,183 @@ 
    * You should have received a copy of the GNU General Public License
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
+   */
   class Database{
 	
 	/**
 	 * The PDO instance
 	 * @var object
-	*/
-    private $pdo                 = null;
+	 */
+	private $pdo                 = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
-	*/
+	 */
 	private $databaseName        = null;
     
 	/**
 	 * The SQL SELECT statment
 	 * @var string
-	*/
+	 */
 	private $select              = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
-	*/
-    private $from                = null;
+	 */
+	private $from                = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
-	*/
-    private $where               = null;
+	 */
+	private $where               = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
-	*/
-    private $limit               = null;
+	 */
+	private $limit               = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
-	*/
-    private $join                = null;
+	 */
+	private $join                = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
-	*/
-    private $orderBy             = null;
+	 */
+	private $orderBy             = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
-	*/
-    private $groupBy             = null;
+	 */
+	private $groupBy             = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
-	*/
-    private $having              = null;
+	 */
+	private $having              = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
-	*/
-    private $numRows             = 0;
+	 */
+	private $numRows             = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
-	*/
-    private $insertId            = null;
+	 */
+	private $insertId            = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
-	*/
-    private $query               = null;
+	 */
+	private $query               = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
-	*/
-    private $error               = null;
+	 */
+	private $error               = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
-	*/
-    private $result              = array();
+	 */
+	private $result              = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
-	*/
-    private $prefix              = null;
+	 */
+	private $prefix              = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
-	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+	 */
+	private $operatorList        = array('=','!=','<','>','<=','>=','<>');
     
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
-	*/
+	 */
 	private $cacheTtl              = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
-	*/
-    private $temporaryCacheTtl   = 0;
+	 */
+	private $temporaryCacheTtl   = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
-	*/
-    private $queryCount          = 0;
+	 */
+	private $queryCount          = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
-	*/
-    private $data                = array();
+	 */
+	private $data                = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
-	*/
-    private $config              = array();
+	 */
+	private $config              = array();
 	
 	/**
 	 * The logger instance
 	 * @var Log
 	 */
-    private $logger              = null;
-
-
-    /**
-    * The cache instance
-    * @var CacheInterface
-    */
-    private $cacheInstance       = null;
-
-     /**
-    * The benchmark instance
-    * @var Benchmark
-    */
-    private $benchmarkInstance   = null;
-
-
-    /**
-     * Construct new database
-     * @param array $overwriteConfig the config to overwrite with the config set in database.php
-     * @param object $logger the log instance
-     */
-    public function __construct($overwriteConfig = array(), Log $logger = null){
-        /**
-         * instance of the Log class
-         */
-        if(is_object($logger)){
-          $this->logger = $logger;
-        }
-        else{
-            $this->logger =& class_loader('Log', 'classes');
-            $this->logger->setLogger('Library::Database');
-        }
-
-        $db = array();
-      	if(file_exists(CONFIG_PATH . 'database.php')){
-          //here don't use require_once because somewhere user can create database instance directly
-      	  require CONFIG_PATH . 'database.php';
-        }
+	private $logger              = null;
+
+
+	/**
+	 * The cache instance
+	 * @var CacheInterface
+	 */
+	private $cacheInstance       = null;
+
+	 /**
+	  * The benchmark instance
+	  * @var Benchmark
+	  */
+	private $benchmarkInstance   = null;
+
+
+	/**
+	 * Construct new database
+	 * @param array $overwriteConfig the config to overwrite with the config set in database.php
+	 * @param object $logger the log instance
+	 */
+	public function __construct($overwriteConfig = array(), Log $logger = null){
+		/**
+		 * instance of the Log class
+		 */
+		if(is_object($logger)){
+		  $this->logger = $logger;
+		}
+		else{
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Database');
+		}
+
+		$db = array();
+	  	if(file_exists(CONFIG_PATH . 'database.php')){
+		  //here don't use require_once because somewhere user can create database instance directly
+	  	  require CONFIG_PATH . 'database.php';
+		}
           
 				if(! empty($overwriteConfig)){
 				  $db = array_merge($db, $overwriteConfig);
@@ -211,1018 +211,1018 @@ 
 				$config['charset']   = isset($db['charset']) ? $db['charset'] : 'utf8';
 				$config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
 				$config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
-        $port = '';
-        if(strstr($config['hostname'], ':')){
-          $p = explode(':', $config['hostname']);
-          $port = isset($p[1]) ? $p[1] : '';
-        }
+		$port = '';
+		if(strstr($config['hostname'], ':')){
+		  $p = explode(':', $config['hostname']);
+		  $port = isset($p[1]) ? $p[1] : '';
+		}
 				$config['port']      = $port;
 				
 		  	$this->setDatabaseConfiguration($config);
 
-    		$this->temporaryCacheTtl = $this->cacheTtl;
-    }
-
-    /**
-     * This is used to connect to database
-     * @return bool 
-     */
-    public function connect(){
-      $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
-        try{
-            $dsn = '';
-            if($config['driver'] == 'mysql' || $config['driver'] == '' || $config['driver'] == 'pgsql'){
-                $dsn = $config['driver'] . ':host=' . $config['hostname'] . ';'
-                . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
-                . 'dbname=' . $config['database'];
-            }
-            else if ($config['driver'] == 'sqlite'){
-              $dsn = 'sqlite:' . $config['database'];
-            }
-            else if($config['driver'] == 'oracle'){
-              $dsn = 'oci:dbname=' . $config['host'] . '/' . $config['database'];
-            }
+			$this->temporaryCacheTtl = $this->cacheTtl;
+	}
+
+	/**
+	 * This is used to connect to database
+	 * @return bool 
+	 */
+	public function connect(){
+	  $config = $this->getDatabaseConfiguration();
+	  if(! empty($config)){
+		try{
+			$dsn = '';
+			if($config['driver'] == 'mysql' || $config['driver'] == '' || $config['driver'] == 'pgsql'){
+				$dsn = $config['driver'] . ':host=' . $config['hostname'] . ';'
+				. (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
+				. 'dbname=' . $config['database'];
+			}
+			else if ($config['driver'] == 'sqlite'){
+			  $dsn = 'sqlite:' . $config['database'];
+			}
+			else if($config['driver'] == 'oracle'){
+			  $dsn = 'oci:dbname=' . $config['host'] . '/' . $config['database'];
+			}
             
-            $this->pdo = new PDO($dsn, $config['username'], $config['password']);
-            $this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
-            $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
-            $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-            return true;
-          }
-          catch (PDOException $e){
-            $this->logger->fatal($e->getMessage());
-            show_error('Cannot connect to Database.');
-            return false;
-          }
-      }
-      else{
-        show_error('Database configuration is not set.');
-        return false;
-      }
-    }
-
-    /**
-     * Set the SQL FROM statment
-     * @param  string|array $table the table name or array of table list
-     * @return object        the current Database instance
-     */
-    public function from($table){
-      if(is_array($table)){
-        $froms = '';
-        foreach($table as $key){
-          $froms .= $this->prefix . $key . ', ';
-        }
-        $this->from = rtrim($froms, ', ');
-      }
-      else{
-        $this->from = $this->prefix . $table;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL SELECT statment
-     * @param  string|array $fields the field name or array of field list
-     * @return object        the current Database instance
-     */
-    public function select($fields){
-      $select = (is_array($fields) ? implode(', ', $fields) : $fields);
-      $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
-      return $this;
-    }
-
-    /**
-     * Set the SQL SELECT DISTINCT statment
-     * @param  string $field the field name to distinct
-     * @return object        the current Database instance
-     */
-    public function distinct($field){
-      $distinct = ' DISTINCT ' . $field;
-      $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
-
-      return $this;
-    }
-
-    /**
-     * Set the SQL function MAX in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function max($field, $name = null){
-      $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function MIN in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function min($field, $name = null){
-      $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function SUM in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function sum($field, $name = null){
-      $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function COUNT in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function count($field = '*', $name = null){
-      $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL function AVG in SELECT statment
-     * @param  string $field the field name
-     * @param  string $name  if is not null represent the alias used for this field in the result
-     * @return object        the current Database instance
-     */
-    public function avg($field, $name = null){
-      $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
-      $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
-      return $this;
-    }
-
-    /**
-     * Set the SQL JOIN statment
-     * @param  string $table  the join table name
-     * @param  string $field1 the first field for join conditions	
-     * @param  string $op     the join condition operator. If is null the default will be "="
-     * @param  string $field2 the second field for join conditions
-     * @param  string $type   the type of join (INNER, LEFT, RIGHT)
-     * @return object        the current Database instance
-     */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
-      $on = $field1;
-      $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
-      }
-      if (is_null($this->join)){
-        $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
-        $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL INNER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'INNER ');
-    }
-
-    /**
-     * Set the SQL LEFT JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'LEFT ');
-	}
-
-	/**
-     * Set the SQL RIGHT JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'RIGHT ');
-    }
-
-    /**
-     * Set the SQL FULL OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
-    	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
-    }
-
-    /**
-     * Set the SQL LEFT OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
-    }
-
-    /**
-     * Set the SQL RIGHT OUTER JOIN statment
-     * @see  Database::join()
-     * @return object        the current Database instance
-     */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
-      return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE for IS NULL
-     * @param  string|array $field  the field name or array of field list
-     * @param  string $andOr the separator type used 'AND', 'OR', etc.
-     * @return object        the current Database instance
-     */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
-        	$this->whereIsNull($f, $andOr);
-        }
-      }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
-        }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
-          }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE for IS NOT NULL
-     * @param  string|array $field  the field name or array of field list
-     * @param  string $andOr the separator type used 'AND', 'OR', etc.
-     * @return object        the current Database instance
-     */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
-          $this->whereIsNotNull($f, $andOr);
-        }
-      }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
-        }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
-          }
-      }
-      return $this;
-    }
+			$this->pdo = new PDO($dsn, $config['username'], $config['password']);
+			$this->pdo->exec("SET NAMES '" . $config['charset'] . "' COLLATE '" . $config['collation'] . "'");
+			$this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
+			$this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+			return true;
+		  }
+		  catch (PDOException $e){
+			$this->logger->fatal($e->getMessage());
+			show_error('Cannot connect to Database.');
+			return false;
+		  }
+	  }
+	  else{
+		show_error('Database configuration is not set.');
+		return false;
+	  }
+	}
+
+	/**
+	 * Set the SQL FROM statment
+	 * @param  string|array $table the table name or array of table list
+	 * @return object        the current Database instance
+	 */
+	public function from($table){
+	  if(is_array($table)){
+		$froms = '';
+		foreach($table as $key){
+		  $froms .= $this->prefix . $key . ', ';
+		}
+		$this->from = rtrim($froms, ', ');
+	  }
+	  else{
+		$this->from = $this->prefix . $table;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL SELECT statment
+	 * @param  string|array $fields the field name or array of field list
+	 * @return object        the current Database instance
+	 */
+	public function select($fields){
+	  $select = (is_array($fields) ? implode(', ', $fields) : $fields);
+	  $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL SELECT DISTINCT statment
+	 * @param  string $field the field name to distinct
+	 * @return object        the current Database instance
+	 */
+	public function distinct($field){
+	  $distinct = ' DISTINCT ' . $field;
+	  $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
+
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function MAX in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function max($field, $name = null){
+	  $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function MIN in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function min($field, $name = null){
+	  $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function SUM in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function sum($field, $name = null){
+	  $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function COUNT in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function count($field = '*', $name = null){
+	  $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL function AVG in SELECT statment
+	 * @param  string $field the field name
+	 * @param  string $name  if is not null represent the alias used for this field in the result
+	 * @return object        the current Database instance
+	 */
+	public function avg($field, $name = null){
+	  $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
+	  $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL JOIN statment
+	 * @param  string $table  the join table name
+	 * @param  string $field1 the first field for join conditions	
+	 * @param  string $op     the join condition operator. If is null the default will be "="
+	 * @param  string $field2 the second field for join conditions
+	 * @param  string $type   the type of join (INNER, LEFT, RIGHT)
+	 * @return object        the current Database instance
+	 */
+	public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+	  $on = $field1;
+	  $table = $this->prefix . $table;
+	  if(! is_null($op)){
+		$on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+	  }
+	  if (is_null($this->join)){
+		$this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
+	  }
+	  else{
+		$this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL INNER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function innerJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'INNER ');
+	}
+
+	/**
+	 * Set the SQL LEFT JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function leftJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'LEFT ');
+	}
+
+	/**
+	 * Set the SQL RIGHT JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function rightJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'RIGHT ');
+	}
+
+	/**
+	 * Set the SQL FULL OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+		return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
+	}
+
+	/**
+	 * Set the SQL LEFT OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
+	}
+
+	/**
+	 * Set the SQL RIGHT OUTER JOIN statment
+	 * @see  Database::join()
+	 * @return object        the current Database instance
+	 */
+	public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+	  return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE for IS NULL
+	 * @param  string|array $field  the field name or array of field list
+	 * @param  string $andOr the separator type used 'AND', 'OR', etc.
+	 * @return object        the current Database instance
+	 */
+	public function whereIsNull($field, $andOr = 'AND'){
+	  if(is_array($field)){
+		foreach($field as $f){
+			$this->whereIsNull($f, $andOr);
+		}
+	  }
+	  else{
+		if (! $this->where){
+		  $this->where = $field.' IS NULL ';
+		}
+		else{
+			$this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+		  }
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE for IS NOT NULL
+	 * @param  string|array $field  the field name or array of field list
+	 * @param  string $andOr the separator type used 'AND', 'OR', etc.
+	 * @return object        the current Database instance
+	 */
+	public function whereIsNotNull($field, $andOr = 'AND'){
+	  if(is_array($field)){
+		foreach($field as $f){
+		  $this->whereIsNotNull($f, $andOr);
+		}
+	  }
+	  else{
+		if (! $this->where){
+		  $this->where = $field.' IS NOT NULL ';
+		}
+		else{
+			$this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+		  }
+	  }
+	  return $this;
+	}
     
-    /**
-     * Set the SQL WHERE CLAUSE statment
-     * @param  string|array  $where the where field or array of field list
-     * @param  string  $op     the condition operator. If is null the default will be "="
-     * @param  mixed  $val    the where value
-     * @param  string  $type   the type used for this where clause (NOT, etc.)
-     * @param  string  $andOr the separator type used 'AND', 'OR', etc.
-     * @param  boolean $escape whether to escape or not the $val
-     * @return object        the current Database instance
-     */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($where)){
-        $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
-            $data = '';
-          }
-          $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
-        }
-        $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
-        if(is_array($op)){
-          $x = explode('?', $where);
-          $w = '';
-          foreach($x as $k => $v){
-            if(! empty($v)){
-                if(isset($op[$k]) && is_null($op[$k])){
-                  $op[$k] = '';
-                }
-                $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
-            }
-          }
-          $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
-            $op = '';
-          }
-        	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
-          if(is_null($val)){
-            $val = '';
-          }
-        	$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
-        }
-      }
-      if (is_null($this->where)){
-        $this->where = $where;
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $where;
-        }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $where;
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using OR
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
-      return $this->where($where, $op, $val, '', 'OR', $escape);
-    }
-
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using AND and NOT
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
-      return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment using OR and NOT
-     * @see  Database::where()
-     * @return object        the current Database instance
-     */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
-    	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query
-     * @param  string $type   the type of this grouped (NOT, etc.)
-     * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
-     * @return object        the current Database instance
-     */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (is_null($this->where)){
-        $this->where = $type . ' (';
-      }
-      else{
-          if(substr($this->where, -1) == '('){
-            $this->where .= $type . ' (';
-          }
-          else{
-          	$this->where .= $andOr . ' ' . $type . ' (';
-          }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query using NOT type
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function notGroupStart(){
-      return $this->groupStart('NOT');
-    }
-
-    /**
-     * Set the opened parenthesis for the complex SQL query using OR for separator
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function orGroupStart(){
-      return $this->groupStart('', ' OR');
-    }
-
-     /**
-     * Set the opened parenthesis for the complex SQL query using OR for separator and NOT for type
-     * @see  Database::groupStart()
-     * @return object        the current Database instance
-     */
-    public function orNotGroupStart(){
-      return $this->groupStart('NOT', ' OR');
-    }
-
-    /**
-     * Close the parenthesis for the grouped SQL
-     * @return object        the current Database instance
-     */
-    public function groupEnd(){
-      $this->where .= ')';
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for IN
-     * @param  string  $field  the field name for IN statment
-     * @param  array   $keys   the list of values used
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($keys)){
-        $_keys = array();
-        foreach ($keys as $k => $v){
-          if(is_null($v)){
-            $v = '';
-          }
-          $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
-        }
-        $keys = implode(', ', $_keys);
-        if (is_null($this->where)){
-          $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-        }
-        else{
-          if(substr($this->where, -1) == '('){
-            $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-          else{
-            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function notIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for IN with OR separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function orIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for NOT IN with OR separator
-     * @see  Database::in()
-     * @return object        the current Database instance
-     */
-    public function orNotIn($field, array $keys, $escape = true){
-      return $this->in($field, $keys, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN
-     * @param  string  $field  the field used for the BETWEEN statment
-     * @param  mixed  $value1 the BETWEEN begin value
-     * @param  mixed  $value2 the BETWEEN end value
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
-        $value1 = '';
-      }
-      if(is_null($value2)){
-        $value2 = '';
-      }
-      if (is_null($this->where)){
-      	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
-          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function notBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with OR separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function orBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and OR separator
-     * @see  Database::between()
-     * @return object        the current Database instance
-     */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
-      return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE
-     * @param  string  $field  the field name used in LIKE statment
-     * @param  string  $data   the LIKE value for this field including the '%', and '_' part
-     * @param  string  $type   the condition separator type (NOT)
-     * @param  string  $andOr the multiple conditions separator (OR, AND)
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($data)){
-        $data = '';
-      }
-      $like = $escape ? $this->escape($data) : $data;
-      if (is_null($this->where)){
-        $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
-        if(substr($this->where, -1) == '('){
-          $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function orLike($field, $data, $escape = true){
-      return $this->like($field, $data, '', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and AND separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function notLike($field, $data, $escape = true){
-      return $this->like($field, $data, 'NOT ', 'AND', $escape);
-    }
-
-    /**
-     * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and OR separator
-     * @see  Database::like()
-     * @return object        the current Database instance
-     */
-    public function orNotLike($field, $data, $escape = true){
-      return $this->like($field, $data, 'NOT ', 'OR', $escape);
-    }
-
-    /**
-     * Set the SQL LIMIT statment
-     * @param  int $limit    the limit offset. If $limitEnd is null this will be the limit count
-     * like LIMIT n;
-     * @param  int $limitEnd the limit count
-     * @return object        the current Database instance
-     */
-    public function limit($limit, $limitEnd = null){
-      if(is_null($limit)){
-        return;
-      }
-      if (! is_null($limitEnd)){
-        $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
-        $this->limit = $limit;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL ORDER BY CLAUSE statment
-     * @param  string $orderBy   the field name used for order
-     * @param  string $orderDir the order direction (ASC or DESC)
-     * @return object        the current Database instance
-     */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! is_null($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
-        }
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL GROUP BY CLAUSE statment
-     * @param  string|array $field the field name used or array of field list
-     * @return object        the current Database instance
-     */
-    public function groupBy($field){
-      if(is_array($field)){
-        $this->groupBy = implode(', ', $field);
-      }
-      else{
-        $this->groupBy = $field;
-      }
-      return $this;
-    }
-
-    /**
-     * Set the SQL HAVING CLAUSE statment
-     * @param  string  $field  the field name used for HAVING statment
-     * @param  string|array  $op     the operator used or array
-     * @param  mixed  $val    the value for HAVING comparaison
-     * @param  boolean $escape whether to escape or not the values
-     * @return object        the current Database instance
-     */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
-        $x = explode('?', $field);
-        $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
-              $op[$k] = '';
-            }
-  	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
-  	      }
-      	}
-        $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
-          $op = '';
-        }
-        $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
-        if(is_null($val)){
-          $val = '';
-        }
-        $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
-      }
-      return $this;
-    }
-
-    /**
-     * Return the number of rows returned by the current query
-     * @return int
-     */
-    public function numRows(){
-      return $this->numRows;
-    }
-
-    /**
-     * Return the last insert id value
-     * @return mixed
-     */
-    public function insertId(){
-      return $this->insertId;
-    }
-
-    /**
-     * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
-     */
-    public function error(){
+	/**
+	 * Set the SQL WHERE CLAUSE statment
+	 * @param  string|array  $where the where field or array of field list
+	 * @param  string  $op     the condition operator. If is null the default will be "="
+	 * @param  mixed  $val    the where value
+	 * @param  string  $type   the type used for this where clause (NOT, etc.)
+	 * @param  string  $andOr the separator type used 'AND', 'OR', etc.
+	 * @param  boolean $escape whether to escape or not the $val
+	 * @return object        the current Database instance
+	 */
+	public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
+	  if (is_array($where)){
+		$_where = array();
+		foreach ($where as $column => $data){
+		  if(is_null($data)){
+			$data = '';
+		  }
+		  $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
+		}
+		$where = implode(' '.$andOr.' ', $_where);
+	  }
+	  else{
+		if(is_array($op)){
+		  $x = explode('?', $where);
+		  $w = '';
+		  foreach($x as $k => $v){
+			if(! empty($v)){
+				if(isset($op[$k]) && is_null($op[$k])){
+				  $op[$k] = '';
+				}
+				$w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
+			}
+		  }
+		  $where = $w;
+		}
+		else if (! in_array((string)$op, $this->operatorList)){
+		  if(is_null($op)){
+			$op = '';
+		  }
+			$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
+		}
+		else{
+		  if(is_null($val)){
+			$val = '';
+		  }
+			$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
+		}
+	  }
+	  if (is_null($this->where)){
+		$this->where = $where;
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $where;
+		}
+		else{
+		  $this->where = $this->where . ' '.$andOr.' ' . $where;
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using OR
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function orWhere($where, $op = null, $val = null, $escape = true){
+	  return $this->where($where, $op, $val, '', 'OR', $escape);
+	}
+
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using AND and NOT
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function notWhere($where, $op = null, $val = null, $escape = true){
+	  return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment using OR and NOT
+	 * @see  Database::where()
+	 * @return object        the current Database instance
+	 */
+	public function orNotWhere($where, $op = null, $val = null, $escape = true){
+		return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query
+	 * @param  string $type   the type of this grouped (NOT, etc.)
+	 * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
+	 * @return object        the current Database instance
+	 */
+	public function groupStart($type = '', $andOr = ' AND'){
+	  if (is_null($this->where)){
+		$this->where = $type . ' (';
+	  }
+	  else{
+		  if(substr($this->where, -1) == '('){
+			$this->where .= $type . ' (';
+		  }
+		  else{
+		  	$this->where .= $andOr . ' ' . $type . ' (';
+		  }
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query using NOT type
+	 * @see  Database::groupStart()
+	 * @return object        the current Database instance
+	 */
+	public function notGroupStart(){
+	  return $this->groupStart('NOT');
+	}
+
+	/**
+	 * Set the opened parenthesis for the complex SQL query using OR for separator
+	 * @see  Database::groupStart()
+	 * @return object        the current Database instance
+	 */
+	public function orGroupStart(){
+	  return $this->groupStart('', ' OR');
+	}
+
+	 /**
+	  * Set the opened parenthesis for the complex SQL query using OR for separator and NOT for type
+	  * @see  Database::groupStart()
+	  * @return object        the current Database instance
+	  */
+	public function orNotGroupStart(){
+	  return $this->groupStart('NOT', ' OR');
+	}
+
+	/**
+	 * Close the parenthesis for the grouped SQL
+	 * @return object        the current Database instance
+	 */
+	public function groupEnd(){
+	  $this->where .= ')';
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for IN
+	 * @param  string  $field  the field name for IN statment
+	 * @param  array   $keys   the list of values used
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
+	  if (is_array($keys)){
+		$_keys = array();
+		foreach ($keys as $k => $v){
+		  if(is_null($v)){
+			$v = '';
+		  }
+		  $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
+		}
+		$keys = implode(', ', $_keys);
+		if (is_null($this->where)){
+		  $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
+		}
+		else{
+		  if(substr($this->where, -1) == '('){
+			$this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+		  }
+		  else{
+			$this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+		  }
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for NOT IN with AND separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function notIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for IN with OR separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function orIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for NOT IN with OR separator
+	 * @see  Database::in()
+	 * @return object        the current Database instance
+	 */
+	public function orNotIn($field, array $keys, $escape = true){
+	  return $this->in($field, $keys, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN
+	 * @param  string  $field  the field used for the BETWEEN statment
+	 * @param  mixed  $value1 the BETWEEN begin value
+	 * @param  mixed  $value2 the BETWEEN end value
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
+	  if(is_null($value1)){
+		$value1 = '';
+	  }
+	  if(is_null($value2)){
+		$value2 = '';
+	  }
+	  if (is_null($this->where)){
+	  	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+		}
+		else{
+		  $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and AND separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function notBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with OR separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function orBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for BETWEEN with NOT type and OR separator
+	 * @see  Database::between()
+	 * @return object        the current Database instance
+	 */
+	public function orNotBetween($field, $value1, $value2, $escape = true){
+	  return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE
+	 * @param  string  $field  the field name used in LIKE statment
+	 * @param  string  $data   the LIKE value for this field including the '%', and '_' part
+	 * @param  string  $type   the condition separator type (NOT)
+	 * @param  string  $andOr the multiple conditions separator (OR, AND)
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
+	  if(is_null($data)){
+		$data = '';
+	  }
+	  $like = $escape ? $this->escape($data) : $data;
+	  if (is_null($this->where)){
+		$this->where = $field . ' ' . $type . 'LIKE ' . $like;
+	  }
+	  else{
+		if(substr($this->where, -1) == '('){
+		  $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
+		}
+		else{
+		  $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with OR separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function orLike($field, $data, $escape = true){
+	  return $this->like($field, $data, '', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and AND separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function notLike($field, $data, $escape = true){
+	  return $this->like($field, $data, 'NOT ', 'AND', $escape);
+	}
+
+	/**
+	 * Set the SQL WHERE CLAUSE statment for LIKE with NOT type and OR separator
+	 * @see  Database::like()
+	 * @return object        the current Database instance
+	 */
+	public function orNotLike($field, $data, $escape = true){
+	  return $this->like($field, $data, 'NOT ', 'OR', $escape);
+	}
+
+	/**
+	 * Set the SQL LIMIT statment
+	 * @param  int $limit    the limit offset. If $limitEnd is null this will be the limit count
+	 * like LIMIT n;
+	 * @param  int $limitEnd the limit count
+	 * @return object        the current Database instance
+	 */
+	public function limit($limit, $limitEnd = null){
+	  if(is_null($limit)){
+		return;
+	  }
+	  if (! is_null($limitEnd)){
+		$this->limit = $limit . ', ' . $limitEnd;
+	  }
+	  else{
+		$this->limit = $limit;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL ORDER BY CLAUSE statment
+	 * @param  string $orderBy   the field name used for order
+	 * @param  string $orderDir the order direction (ASC or DESC)
+	 * @return object        the current Database instance
+	 */
+	public function orderBy($orderBy, $orderDir = ' ASC'){
+	  if (! is_null($orderDir)){
+		$this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+	  }
+	  else{
+		if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
+		  $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+		}
+		else{
+		  $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+		}
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL GROUP BY CLAUSE statment
+	 * @param  string|array $field the field name used or array of field list
+	 * @return object        the current Database instance
+	 */
+	public function groupBy($field){
+	  if(is_array($field)){
+		$this->groupBy = implode(', ', $field);
+	  }
+	  else{
+		$this->groupBy = $field;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Set the SQL HAVING CLAUSE statment
+	 * @param  string  $field  the field name used for HAVING statment
+	 * @param  string|array  $op     the operator used or array
+	 * @param  mixed  $val    the value for HAVING comparaison
+	 * @param  boolean $escape whether to escape or not the values
+	 * @return object        the current Database instance
+	 */
+	public function having($field, $op = null, $val = null, $escape = true){
+	  if(is_array($op)){
+		$x = explode('?', $field);
+		$w = '';
+		foreach($x as $k => $v){
+  		  if(!empty($v)){
+			if(isset($op[$k]) && is_null($op[$k])){
+			  $op[$k] = '';
+			}
+  		  	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
+  		  }
+	  	}
+		$this->having = $w;
+	  }
+	  else if (! in_array($op, $this->operatorList)){
+		if(is_null($op)){
+		  $op = '';
+		}
+		$this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
+	  }
+	  else{
+		if(is_null($val)){
+		  $val = '';
+		}
+		$this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Return the number of rows returned by the current query
+	 * @return int
+	 */
+	public function numRows(){
+	  return $this->numRows;
+	}
+
+	/**
+	 * Return the last insert id value
+	 * @return mixed
+	 */
+	public function insertId(){
+	  return $this->insertId;
+	}
+
+	/**
+	 * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
+	 */
+	public function error(){
   		if($this->error){
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
-    }
-
-    /**
-     * Get the result of one record rows returned by the current query
-     * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * If is string will determine the result type "array" or "object"
-     * @return mixed       the query SQL string or the record result
-     */
-    public function get($returnSQLQueryOrResultType = false){
-      $this->limit = 1;
-      $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
-        return $query;
-      }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
-      }
-    }
-
-    /**
-     * Get the result of record rows list returned by the current query
-     * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
-     * If is string will determine the result type "array" or "object"
-     * @return mixed       the query SQL string or the record result
-     */
-    public function getAll($returnSQLQueryOrResultType = false){
-      $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! is_null($this->join)){
-        $query .= $this->join;
-      }
+	}
+
+	/**
+	 * Get the result of one record rows returned by the current query
+	 * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * If is string will determine the result type "array" or "object"
+	 * @return mixed       the query SQL string or the record result
+	 */
+	public function get($returnSQLQueryOrResultType = false){
+	  $this->limit = 1;
+	  $query = $this->getAll(true);
+	  if($returnSQLQueryOrResultType === true){
+		return $query;
+	  }
+	  else{
+		return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+	  }
+	}
+
+	/**
+	 * Get the result of record rows list returned by the current query
+	 * @param  boolean $returnSQLQueryOrResultType if is boolean and true will return the SQL query string.
+	 * If is string will determine the result type "array" or "object"
+	 * @return mixed       the query SQL string or the record result
+	 */
+	public function getAll($returnSQLQueryOrResultType = false){
+	  $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
+	  if (! is_null($this->join)){
+		$query .= $this->join;
+	  }
 	  
-      if (! is_null($this->where)){
-        $query .= ' WHERE ' . $this->where;
-      }
+	  if (! is_null($this->where)){
+		$query .= ' WHERE ' . $this->where;
+	  }
 
-      if (! is_null($this->groupBy)){
-        $query .= ' GROUP BY ' . $this->groupBy;
-      }
+	  if (! is_null($this->groupBy)){
+		$query .= ' GROUP BY ' . $this->groupBy;
+	  }
 
-      if (! is_null($this->having)){
-        $query .= ' HAVING ' . $this->having;
-      }
+	  if (! is_null($this->having)){
+		$query .= ' HAVING ' . $this->having;
+	  }
 
-      if (! is_null($this->orderBy)){
-          $query .= ' ORDER BY ' . $this->orderBy;
-      }
+	  if (! is_null($this->orderBy)){
+		  $query .= ' ORDER BY ' . $this->orderBy;
+	  }
 
-      if(! is_null($this->limit)){
-      	$query .= ' LIMIT ' . $this->limit;
-      }
+	  if(! is_null($this->limit)){
+	  	$query .= ' LIMIT ' . $this->limit;
+	  }
 	  
 	  if($returnSQLQueryOrResultType === true){
-    	return $query;
-      }
-      else{
-    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
-      }
-    }
-
-    /**
-     * Insert new record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @param  boolean $escape  whether to escape or not the values
-     * @return mixed          the insert id of the new record or null
-     */
-    public function insert($data = array(), $escape = true){
-      $column = array();
-      $val = array();
-      if(! $data && $this->getData()){
-        $columns = array_keys($this->getData());
-        $column = implode(',', $columns);
-        $val = implode(', ', $this->getData());
-      }
-      else{
-        $columns = array_keys($data);
-        $column = implode(',', $columns);
-        $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
-      }
-
-      $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
-      $query = $this->query($query);
-
-      if ($query){
-        if(! $this->pdo){
-          $this->connect();
-        }
-        $this->insertId = $this->pdo->lastInsertId();
-        return $this->insertId();
-      }
-      else{
+		return $query;
+	  }
+	  else{
+		return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+	  }
+	}
+
+	/**
+	 * Insert new record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return mixed          the insert id of the new record or null
+	 */
+	public function insert($data = array(), $escape = true){
+	  $column = array();
+	  $val = array();
+	  if(! $data && $this->getData()){
+		$columns = array_keys($this->getData());
+		$column = implode(',', $columns);
+		$val = implode(', ', $this->getData());
+	  }
+	  else{
+		$columns = array_keys($data);
+		$column = implode(',', $columns);
+		$val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
+	  }
+
+	  $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
+	  $query = $this->query($query);
+
+	  if ($query){
+		if(! $this->pdo){
+		  $this->connect();
+		}
+		$this->insertId = $this->pdo->lastInsertId();
+		return $this->insertId();
+	  }
+	  else{
 		  return false;
-      }
-    }
-
-    /**
-     * Update record in the database
-     * @param  array   $data   the record data if is empty will use the $this->data array.
-     * @param  boolean $escape  whether to escape or not the values
-     * @return mixed          the update status
-     */
-    public function update($data = array(), $escape = true){
-      $query = 'UPDATE ' . $this->from . ' SET ';
-      $values = array();
-      if(! $data && $this->getData()){
-        foreach ($this->getData() as $column => $val){
-          $values[] = $column . ' = ' . $val;
-        }
-      }
-      else{
-        foreach ($data as $column => $val){
-          $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
-        }
-      }
-      $query .= (is_array($data) ? implode(', ', $values) : $data);
-      if (! is_null($this->where)){
-        $query .= ' WHERE ' . $this->where;
-      }
-
-      if (! is_null($this->orderBy)){
-        $query .= ' ORDER BY ' . $this->orderBy;
-      }
-
-      if (! is_null($this->limit)){
-        $query .= ' LIMIT ' . $this->limit;
-      }
-      return $this->query($query);
-    }
-
-    /**
-     * Delete the record in database
-     * @return mixed the delete status
-     */
-    public function delete(){
-    	$query = 'DELETE FROM ' . $this->from;
-
-    	if (! is_null($this->where)){
-    		$query .= ' WHERE ' . $this->where;
-      	}
-
-    	if (! is_null($this->orderBy)){
-    	  $query .= ' ORDER BY ' . $this->orderBy;
-      	}
-
-    	if (! is_null($this->limit)){
-    		$query .= ' LIMIT ' . $this->limit;
-      	}
-
-    	if($query == 'DELETE FROM ' . $this->from){
-    		$query = 'TRUNCATE TABLE ' . $this->from;
-      	}
-    	return $this->query($query);
-    }
-
-    /**
-     * Execute an SQL query
-     * @param  string  $query the query SQL string
-     * @param  boolean $all   whether to return all record or not
-     * @param  boolean $array return the result as array
-     * @return mixed         the query result
-     */
-    public function query($query, $all = true, $array = false){
-      $this->reset();
-      if(is_array($all)){
-        $x = explode('?', $query);
-        $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
-            $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
-          }
-        }
-        $query = $q;
-      }
-
-      $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
-      $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
-      //cache expire time
+	  }
+	}
+
+	/**
+	 * Update record in the database
+	 * @param  array   $data   the record data if is empty will use the $this->data array.
+	 * @param  boolean $escape  whether to escape or not the values
+	 * @return mixed          the update status
+	 */
+	public function update($data = array(), $escape = true){
+	  $query = 'UPDATE ' . $this->from . ' SET ';
+	  $values = array();
+	  if(! $data && $this->getData()){
+		foreach ($this->getData() as $column => $val){
+		  $values[] = $column . ' = ' . $val;
+		}
+	  }
+	  else{
+		foreach ($data as $column => $val){
+		  $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
+		}
+	  }
+	  $query .= (is_array($data) ? implode(', ', $values) : $data);
+	  if (! is_null($this->where)){
+		$query .= ' WHERE ' . $this->where;
+	  }
+
+	  if (! is_null($this->orderBy)){
+		$query .= ' ORDER BY ' . $this->orderBy;
+	  }
+
+	  if (! is_null($this->limit)){
+		$query .= ' LIMIT ' . $this->limit;
+	  }
+	  return $this->query($query);
+	}
+
+	/**
+	 * Delete the record in database
+	 * @return mixed the delete status
+	 */
+	public function delete(){
+		$query = 'DELETE FROM ' . $this->from;
+
+		if (! is_null($this->where)){
+			$query .= ' WHERE ' . $this->where;
+	  	}
+
+		if (! is_null($this->orderBy)){
+		  $query .= ' ORDER BY ' . $this->orderBy;
+	  	}
+
+		if (! is_null($this->limit)){
+			$query .= ' LIMIT ' . $this->limit;
+	  	}
+
+		if($query == 'DELETE FROM ' . $this->from){
+			$query = 'TRUNCATE TABLE ' . $this->from;
+	  	}
+		return $this->query($query);
+	}
+
+	/**
+	 * Execute an SQL query
+	 * @param  string  $query the query SQL string
+	 * @param  boolean $all   whether to return all record or not
+	 * @param  boolean $array return the result as array
+	 * @return mixed         the query result
+	 */
+	public function query($query, $all = true, $array = false){
+	  $this->reset();
+	  if(is_array($all)){
+		$x = explode('?', $query);
+		$q = '';
+		foreach($x as $k => $v){
+		  if(! empty($v)){
+			$q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
+		  }
+		}
+		$query = $q;
+	  }
+
+	  $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
+	  $sqlSELECTQuery = stristr($this->query, 'SELECT');
+	  $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+	  //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
   	  //return to the initial cache time
   	  $this->temporaryCacheTtl = $this->cacheTtl;
   	  
   	  //config for cache
-        $cacheEnable = get_config('cache_enable');
+		$cacheEnable = get_config('cache_enable');
   	  
   	  //the database cache content
-        $cacheContent = null;
+		$cacheContent = null;
   	  
   	  //this database query cache key
-        $cacheKey = null;
+		$cacheKey = null;
   	  
   	  //the cache manager instance
-      $cacheInstance = null;
+	  $cacheInstance = null;
   	  
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
-        $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
-        $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
-          $cacheInstance = $this->cacheInstance;
-        }
-        else{
-          $obj = & get_instance();
-          $cacheInstance = $obj->cache;  
-        }
-        $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+	  if ($dbCacheStatus && $sqlSELECTQuery){
+		$this->logger->info('The cache is enabled for this query, try to get result from cache'); 
+		$cacheKey = md5($query . $all . $array);
+		if(is_object($this->cacheInstance)){
+		  $cacheInstance = $this->cacheInstance;
+		}
+		else{
+		  $obj = & get_instance();
+		  $cacheInstance = $obj->cache;  
+		}
+		$cacheContent = $cacheInstance->get($cacheKey);        
+	  }
+	  else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
-      }
+	  }
 
-      if(! $this->pdo){
-        $this->connect();
-      }
+	  if(! $this->pdo){
+		$this->connect();
+	  }
       
-      if (! $cacheContent && $sqlSELECTQuery){
-		    //for database query execution time
-        $benchmarkMarkerKey = md5($query . $all . $array);
-        $bench = null;
-        if(is_object($this->benchmarkInstance)){
-          $bench = $this->benchmarkInstance;
-        }
-        else{
-          $obj = & get_instance();
-          $bench = $obj->benchmark;  
-        }
-        $bench->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
-        //Now execute the query
-		    $sqlQuery = $this->pdo->query($this->query);
+	  if (! $cacheContent && $sqlSELECTQuery){
+			//for database query execution time
+		$benchmarkMarkerKey = md5($query . $all . $array);
+		$bench = null;
+		if(is_object($this->benchmarkInstance)){
+		  $bench = $this->benchmarkInstance;
+		}
+		else{
+		  $obj = & get_instance();
+		  $bench = $obj->benchmark;  
+		}
+		$bench->mark('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')');
+		//Now execute the query
+			$sqlQuery = $this->pdo->query($this->query);
         
-    		//get response time for this query
-        $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
-	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
-        }
-        if ($sqlQuery){
-          $this->numRows = $sqlQuery->rowCount();
-          if (($this->numRows > 0)){
-		    	//if need return all result like list of record
-            if ($all){
-    				$this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
-				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
-            }
-          }
-          if ($dbCacheStatus && $sqlSELECTQuery){
-            $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
-            $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
-          }
-        }
-        else{
-          $error = $this->pdo->errorInfo();
-          $this->error = $error[2];
-          $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
-          $this->error();
-        }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
-    		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
-    			$this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
-    			$this->numRows = $queryStr->rowCount();
-    		}
-        if (! $this->result){
-          $error = $this->pdo->errorInfo();
-          $this->error = $error[2];
-          $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
-          $this->error();
-        }
-      }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
-        $this->result = $cacheContent;
-	     	$this->numRows = count($this->result);
-      }
-      $this->queryCount++;
-      if(! $this->result){
-        $this->logger->info('No result where found for the query [' . $query . ']');
-      }
-      return $this->result;
-    }
-
-    /**
-     * Set database cache time to live
-     * @param integer $ttl the cache time to live in second
-     * @return object        the current Database instance
-     */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
-        $this->cacheTtl = $ttl;
-		    $this->temporaryCacheTtl = $ttl;
-      }
-      return $this;
-    }
+			//get response time for this query
+		$responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
+		 	//TODO use the configuration value for the high response time currently is 1 second
+		if($responseTime >= 1 ){
+			$this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+		}
+		if ($sqlQuery){
+		  $this->numRows = $sqlQuery->rowCount();
+		  if (($this->numRows > 0)){
+				//if need return all result like list of record
+			if ($all){
+					$this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
+				}
+			else{
+						$this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
+			}
+		  }
+		  if ($dbCacheStatus && $sqlSELECTQuery){
+			$this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+			$cacheInstance->set($cacheKey, $this->result, $cacheExpire);
+		  }
+		}
+		else{
+		  $error = $this->pdo->errorInfo();
+		  $this->error = $error[2];
+		  $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
+		  $this->error();
+		}
+	  }
+	  else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+			$queryStr = $this->pdo->query($this->query);
+			if($queryStr){
+				$this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
+				$this->numRows = $queryStr->rowCount();
+			}
+		if (! $this->result){
+		  $error = $this->pdo->errorInfo();
+		  $this->error = $error[2];
+		  $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
+		  $this->error();
+		}
+	  }
+	  else{
+		$this->logger->info('The result for query [' .$this->query. '] already cached use it');
+		$this->result = $cacheContent;
+		 	$this->numRows = count($this->result);
+	  }
+	  $this->queryCount++;
+	  if(! $this->result){
+		$this->logger->info('No result where found for the query [' . $query . ']');
+	  }
+	  return $this->result;
+	}
+
+	/**
+	 * Set database cache time to live
+	 * @param integer $ttl the cache time to live in second
+	 * @return object        the current Database instance
+	 */
+	public function setCache($ttl = 0){
+	  if($ttl > 0){
+		$this->cacheTtl = $ttl;
+			$this->temporaryCacheTtl = $ttl;
+	  }
+	  return $this;
+	}
 	
 	/**
 	 * Enabled cache temporary for the current query not globally	
@@ -1230,186 +1230,186 @@ 
 	 * @return object        the current Database instance
 	 */
 	public function cached($ttl = 0){
-      if($ttl > 0){
-        $this->temporaryCacheTtl = $ttl;
-      }
+	  if($ttl > 0){
+		$this->temporaryCacheTtl = $ttl;
+	  }
+	  return $this;
+	}
+
+	/**
+	 * Escape the data before execute query useful for security.
+	 * @param  mixed $data the data to be escaped
+	 * @return mixed       the data after escaped
+	 */
+	public function escape($data){
+	  if(is_null($data)){
+		return null;
+	  }
+	  if(! $this->pdo){
+		$this->connect();
+	  }
+	  return $this->pdo->quote(trim($data));
+	}
+
+	/**
+	 * Return the number query executed count for the current request
+	 * @return int
+	 */
+	public function queryCount(){
+	  return $this->queryCount;
+	}
+
+	/**
+	 * Return the current query SQL string
+	 * @return string
+	 */
+	public function getQuery(){
+	  return $this->query;
+	}
+
+	/**
+	 * Return the application database name
+	 * @return string
+	 */
+	public function getDatabaseName(){
+	  return $this->databaseName;
+	}
+
+	 /**
+	  * Return the database configuration
+	  * @return array
+	  */
+	public  function getDatabaseConfiguration(){
+	  return $this->config;
+	}
+
+	/**
+	 * set the database configuration
+	 * @param array $config the configuration
+	 */
+	public function setDatabaseConfiguration(array $config){
+	  $this->config = array_merge($this->config, $config);
+	  $this->prefix = $this->config['prefix'];
+	  $this->databaseName = $this->config['database'];
+	  $this->logger->info('The database configuration are listed below: ' . stringfy_vars(array_merge($this->config, array('password' => string_hidden($this->config['password'])))));
+	  return $this;
+	}
+
+	/**
+	 * Return the PDO instance
+	 * @return PDO
+	 */
+	public function getPdo(){
+	  return $this->pdo;
+	}
+
+	/**
+	 * Set the PDO instance
+	 * @param PDO $pdo the pdo object
+	 */
+	public function setPdo(PDO $pdo){
+	  $this->pdo = $pdo;
+	  return $this;
+	}
+
+
+	/**
+	 * Return the Log instance
+	 * @return Log
+	 */
+	public function getLogger(){
+	  return $this->logger;
+	}
+
+	/**
+	 * Set the log instance
+	 * @param Log $logger the log object
+	 */
+	public function setLogger($logger){
+	  $this->logger = $logger;
+	  return $this;
+	}
+
+	 /**
+	  * Return the cache instance
+	  * @return CacheInterface
+	  */
+	public function getCacheInstance(){
+	  return $this->cacheInstance;
+	}
+
+	/**
+	 * Set the cache instance
+	 * @param CacheInterface $cache the cache object
+	 */
+	public function setCacheInstance($cache){
+	  $this->cacheInstance = $cache;
+	  return $this;
+	}
+
+	/**
+	 * Return the benchmark instance
+	 * @return Benchmark
+	 */
+	public function getBenchmark(){
+	  return $this->benchmarkInstance;
+	}
+
+	/**
+	 * Set the benchmark instance
+	 * @param Benchmark $cache the cache object
+	 */
+	public function setBenchmark($benchmark){
+	  $this->benchmarkInstance = $benchmark;
+	  return $this;
+	}
+
+	/**
+	 * Return the data to be used for insert, update, etc.
+	 * @return array
+	 */
+	public function getData(){
+	  return $this->data;
+	}
+
+	/**
+	 * Set the data to be used for insert, update, etc.
+	 * @param string $key the data key identified
+	 * @param mixed $value the data value
+	 * @param boolean $escape whether to escape or not the $value
+	 * @return object        the current Database instance
+	 */
+	public function setData($key, $value, $escape = true){
+	  $this->data[$key] = $escape ? $this->escape($value) : $value;
 	  return $this;
-    }
-
-    /**
-     * Escape the data before execute query useful for security.
-     * @param  mixed $data the data to be escaped
-     * @return mixed       the data after escaped
-     */
-    public function escape($data){
-      if(is_null($data)){
-        return null;
-      }
-      if(! $this->pdo){
-        $this->connect();
-      }
-      return $this->pdo->quote(trim($data));
-    }
-
-    /**
-     * Return the number query executed count for the current request
-     * @return int
-     */
-    public function queryCount(){
-      return $this->queryCount;
-    }
-
-    /**
-     * Return the current query SQL string
-     * @return string
-     */
-    public function getQuery(){
-      return $this->query;
-    }
-
-    /**
-     * Return the application database name
-     * @return string
-     */
-    public function getDatabaseName(){
-      return $this->databaseName;
-    }
-
-     /**
-     * Return the database configuration
-     * @return array
-     */
-    public  function getDatabaseConfiguration(){
-      return $this->config;
-    }
-
-    /**
-     * set the database configuration
-     * @param array $config the configuration
-     */
-    public function setDatabaseConfiguration(array $config){
-      $this->config = array_merge($this->config, $config);
-      $this->prefix = $this->config['prefix'];
-      $this->databaseName = $this->config['database'];
-      $this->logger->info('The database configuration are listed below: ' . stringfy_vars(array_merge($this->config, array('password' => string_hidden($this->config['password'])))));
-      return $this;
-    }
-
-    /**
-     * Return the PDO instance
-     * @return PDO
-     */
-    public function getPdo(){
-      return $this->pdo;
-    }
-
-    /**
-     * Set the PDO instance
-     * @param PDO $pdo the pdo object
-     */
-    public function setPdo(PDO $pdo){
-      $this->pdo = $pdo;
-      return $this;
-    }
-
-
-    /**
-     * Return the Log instance
-     * @return Log
-     */
-    public function getLogger(){
-      return $this->logger;
-    }
-
-    /**
-     * Set the log instance
-     * @param Log $logger the log object
-     */
-    public function setLogger($logger){
-      $this->logger = $logger;
-      return $this;
-    }
-
-     /**
-     * Return the cache instance
-     * @return CacheInterface
-     */
-    public function getCacheInstance(){
-      return $this->cacheInstance;
-    }
-
-    /**
-     * Set the cache instance
-     * @param CacheInterface $cache the cache object
-     */
-    public function setCacheInstance($cache){
-      $this->cacheInstance = $cache;
-      return $this;
-    }
-
-    /**
-     * Return the benchmark instance
-     * @return Benchmark
-     */
-    public function getBenchmark(){
-      return $this->benchmarkInstance;
-    }
-
-    /**
-     * Set the benchmark instance
-     * @param Benchmark $cache the cache object
-     */
-    public function setBenchmark($benchmark){
-      $this->benchmarkInstance = $benchmark;
-      return $this;
-    }
-
-    /**
-     * Return the data to be used for insert, update, etc.
-     * @return array
-     */
-    public function getData(){
-      return $this->data;
-    }
-
-    /**
-     * Set the data to be used for insert, update, etc.
-     * @param string $key the data key identified
-     * @param mixed $value the data value
-     * @param boolean $escape whether to escape or not the $value
-     * @return object        the current Database instance
-     */
-    public function setData($key, $value, $escape = true){
-      $this->data[$key] = $escape ? $this->escape($value) : $value;
-      return $this;
-    }
+	}
 
 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
   private function reset(){
-    $this->select   = '*';
-    $this->from     = null;
-    $this->where    = null;
-    $this->limit    = null;
-    $this->orderBy  = null;
-    $this->groupBy  = null;
-    $this->having   = null;
-    $this->join     = null;
-    $this->numRows  = 0;
-    $this->insertId = null;
-    $this->query    = null;
-    $this->error    = null;
-    $this->result   = array();
-    $this->data     = array();
+	$this->select   = '*';
+	$this->from     = null;
+	$this->where    = null;
+	$this->limit    = null;
+	$this->orderBy  = null;
+	$this->groupBy  = null;
+	$this->having   = null;
+	$this->join     = null;
+	$this->numRows  = 0;
+	$this->insertId = null;
+	$this->query    = null;
+	$this->error    = null;
+	$this->result   = array();
+	$this->data     = array();
   }
 
   /**
    * The class destructor
    */
   function __destruct(){
-    $this->pdo = null;
+	$this->pdo = null;
   }
 
 }

Spacing +257 added lines, -257 removed lines

@@ -23,158 +23,158 @@ 
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
-  class Database{
+  class Database {
 	
 	/**
 	 * The PDO instance
 	 * @var object
 	*/
-    private $pdo                 = null;
+    private $pdo = null;
     
 	/**
 	 * The database name used for the application
 	 * @var string
 	*/
-	private $databaseName        = null;
+	private $databaseName = null;
     
 	/**
 	 * The SQL SELECT statment
 	 * @var string
 	*/
-	private $select              = '*';
+	private $select = '*';
 	
 	/**
 	 * The SQL FROM statment
 	 * @var string
 	*/
-    private $from                = null;
+    private $from = null;
 	
 	/**
 	 * The SQL WHERE statment
 	 * @var string
 	*/
-    private $where               = null;
+    private $where = null;
 	
 	/**
 	 * The SQL LIMIT statment
 	 * @var string
 	*/
-    private $limit               = null;
+    private $limit = null;
 	
 	/**
 	 * The SQL JOIN statment
 	 * @var string
 	*/
-    private $join                = null;
+    private $join = null;
 	
 	/**
 	 * The SQL ORDER BY statment
 	 * @var string
 	*/
-    private $orderBy             = null;
+    private $orderBy = null;
 	
 	/**
 	 * The SQL GROUP BY statment
 	 * @var string
 	*/
-    private $groupBy             = null;
+    private $groupBy = null;
 	
 	/**
 	 * The SQL HAVING statment
 	 * @var string
 	*/
-    private $having              = null;
+    private $having = null;
 	
 	/**
 	 * The number of rows returned by the last query
 	 * @var int
 	*/
-    private $numRows             = 0;
+    private $numRows = 0;
 	
 	/**
 	 * The last insert id for the primary key column that have auto increment or sequence
 	 * @var mixed
 	*/
-    private $insertId            = null;
+    private $insertId = null;
 	
 	/**
 	 * The full SQL query statment after build for each command
 	 * @var string
 	*/
-    private $query               = null;
+    private $query = null;
 	
 	/**
 	 * The error returned for the last query
 	 * @var string
 	*/
-    private $error               = null;
+    private $error = null;
 	
 	/**
 	 * The result returned for the last query
 	 * @var mixed
 	*/
-    private $result              = array();
+    private $result = array();
 	
 	/**
 	 * The prefix used in each database table
 	 * @var string
 	*/
-    private $prefix              = null;
+    private $prefix = null;
 	
 	/**
 	 * The list of SQL valid operators
 	 * @var array
 	*/
-    private $operatorList        = array('=','!=','<','>','<=','>=','<>');
+    private $operatorList = array('=', '!=', '<', '>', '<=', '>=', '<>');
     
 	/**
 	 * The cache default time to live in second. 0 means no need to use the cache feature
 	 * @var int
 	*/
-	private $cacheTtl              = 0;
+	private $cacheTtl = 0;
 	
 	/**
 	 * The cache current time to live. 0 means no need to use the cache feature
 	 * @var int
 	*/
-    private $temporaryCacheTtl   = 0;
+    private $temporaryCacheTtl = 0;
 	
 	/**
 	 * The number of executed query for the current request
 	 * @var int
 	*/
-    private $queryCount          = 0;
+    private $queryCount = 0;
 	
 	/**
 	 * The default data to be used in the statments query INSERT, UPDATE
 	 * @var array
 	*/
-    private $data                = array();
+    private $data = array();
 	
 	/**
 	 * The database configuration
 	 * @var array
 	*/
-    private $config              = array();
+    private $config = array();
 	
 	/**
 	 * The logger instance
 	 * @var Log
 	 */
-    private $logger              = null;
+    private $logger = null;
 
 
     /**
     * The cache instance
     * @var CacheInterface
     */
-    private $cacheInstance       = null;
+    private $cacheInstance = null;
 
      /**
     * The benchmark instance
     * @var Benchmark
     */
-    private $benchmarkInstance   = null;
+    private $benchmarkInstance = null;
 
 
     /**
@@ -182,25 +182,25 @@ 
      * @param array $overwriteConfig the config to overwrite with the config set in database.php
      * @param object $logger the log instance
      */
-    public function __construct($overwriteConfig = array(), Log $logger = null){
+    public function __construct($overwriteConfig = array(), Log $logger = null) {
         /**
          * instance of the Log class
          */
-        if(is_object($logger)){
+        if (is_object($logger)) {
           $this->logger = $logger;
         }
-        else{
-            $this->logger =& class_loader('Log', 'classes');
+        else {
+            $this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
 
         $db = array();
-      	if(file_exists(CONFIG_PATH . 'database.php')){
+      	if (file_exists(CONFIG_PATH . 'database.php')) {
           //here don't use require_once because somewhere user can create database instance directly
       	  require CONFIG_PATH . 'database.php';
         }
           
-				if(! empty($overwriteConfig)){
+				if (!empty($overwriteConfig)) {
 				  $db = array_merge($db, $overwriteConfig);
 				}
 				$config['driver']    = isset($db['driver']) ? $db['driver'] : 'mysql';
@@ -212,11 +212,11 @@ 
 				$config['collation'] = isset($db['collation']) ? $db['collation'] : 'utf8_general_ci';
 				$config['prefix']    = isset($db['prefix']) ? $db['prefix'] : '';
         $port = '';
-        if(strstr($config['hostname'], ':')){
+        if (strstr($config['hostname'], ':')) {
           $p = explode(':', $config['hostname']);
           $port = isset($p[1]) ? $p[1] : '';
         }
-				$config['port']      = $port;
+				$config['port'] = $port;
 				
 		  	$this->setDatabaseConfiguration($config);
 
@@ -227,20 +227,20 @@ 
      * This is used to connect to database
      * @return bool 
      */
-    public function connect(){
+    public function connect() {
       $config = $this->getDatabaseConfiguration();
-      if(! empty($config)){
-        try{
+      if (!empty($config)) {
+        try {
             $dsn = '';
-            if($config['driver'] == 'mysql' || $config['driver'] == '' || $config['driver'] == 'pgsql'){
+            if ($config['driver'] == 'mysql' || $config['driver'] == '' || $config['driver'] == 'pgsql') {
                 $dsn = $config['driver'] . ':host=' . $config['hostname'] . ';'
                 . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
                 . 'dbname=' . $config['database'];
             }
-            else if ($config['driver'] == 'sqlite'){
+            else if ($config['driver'] == 'sqlite') {
               $dsn = 'sqlite:' . $config['database'];
             }
-            else if($config['driver'] == 'oracle'){
+            else if ($config['driver'] == 'oracle') {
               $dsn = 'oci:dbname=' . $config['host'] . '/' . $config['database'];
             }
             
@@ -250,13 +250,13 @@ 
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
           }
-          catch (PDOException $e){
+          catch (PDOException $e) {
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
       }
-      else{
+      else {
         show_error('Database configuration is not set.');
         return false;
       }
@@ -267,15 +267,15 @@ 
      * @param  string|array $table the table name or array of table list
      * @return object        the current Database instance
      */
-    public function from($table){
-      if(is_array($table)){
+    public function from($table) {
+      if (is_array($table)) {
         $froms = '';
-        foreach($table as $key){
+        foreach ($table as $key) {
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
       }
-      else{
+      else {
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -286,7 +286,7 @@ 
      * @param  string|array $fields the field name or array of field list
      * @return object        the current Database instance
      */
-    public function select($fields){
+    public function select($fields) {
       $select = (is_array($fields) ? implode(', ', $fields) : $fields);
       $this->select = ($this->select == '*' ? $select : $this->select . ', ' . $select);
       return $this;
@@ -297,7 +297,7 @@ 
      * @param  string $field the field name to distinct
      * @return object        the current Database instance
      */
-    public function distinct($field){
+    public function distinct($field) {
       $distinct = ' DISTINCT ' . $field;
       $this->select = ($this->select == '*' ? $distinct : $this->select . ', ' . $distinct);
 
@@ -310,7 +310,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function max($field, $name = null){
+    public function max($field, $name = null) {
       $func = 'MAX(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -322,7 +322,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function min($field, $name = null){
+    public function min($field, $name = null) {
       $func = 'MIN(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -334,7 +334,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function sum($field, $name = null){
+    public function sum($field, $name = null) {
       $func = 'SUM(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -346,7 +346,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function count($field = '*', $name = null){
+    public function count($field = '*', $name = null) {
       $func = 'COUNT(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -358,7 +358,7 @@ 
      * @param  string $name  if is not null represent the alias used for this field in the result
      * @return object        the current Database instance
      */
-    public function avg($field, $name = null){
+    public function avg($field, $name = null) {
       $func = 'AVG(' . $field . ')' . (!is_null($name) ? ' AS ' . $name : '');
       $this->select = ($this->select == '*' ? $func : $this->select . ', ' . $func);
       return $this;
@@ -373,16 +373,16 @@ 
      * @param  string $type   the type of join (INNER, LEFT, RIGHT)
      * @return object        the current Database instance
      */
-    public function join($table, $field1 = null, $op = null, $field2 = null, $type = ''){
+    public function join($table, $field1 = null, $op = null, $field2 = null, $type = '') {
       $on = $field1;
       $table = $this->prefix . $table;
-      if(! is_null($op)){
-        $on = (! in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
+      if (!is_null($op)) {
+        $on = (!in_array($op, $this->operatorList) ? $this->prefix . $field1 . ' = ' . $this->prefix . $op : $this->prefix . $field1 . ' ' . $op . ' ' . $this->prefix . $field2);
       }
-      if (is_null($this->join)){
+      if (is_null($this->join)) {
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
-      else{
+      else {
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -393,7 +393,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function innerJoin($table, $field1, $op = null, $field2 = ''){
+    public function innerJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'INNER ');
     }
 
@@ -402,7 +402,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT ');
 	}
 
@@ -411,7 +411,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT ');
     }
 
@@ -420,7 +420,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function fullOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function fullOuterJoin($table, $field1, $op = null, $field2 = '') {
     	return $this->join($table, $field1, $op, $field2, 'FULL OUTER ');
     }
 
@@ -429,7 +429,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function leftOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function leftOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'LEFT OUTER ');
     }
 
@@ -438,7 +438,7 @@ 
      * @see  Database::join()
      * @return object        the current Database instance
      */
-    public function rightOuterJoin($table, $field1, $op = null, $field2 = ''){
+    public function rightOuterJoin($table, $field1, $op = null, $field2 = '') {
       return $this->join($table, $field1, $op, $field2, 'RIGHT OUTER ');
     }
 
@@ -448,18 +448,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
         	$this->whereIsNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NULL ';
           }
       }
       return $this;
@@ -471,18 +471,18 @@ 
      * @param  string $andOr the separator type used 'AND', 'OR', etc.
      * @return object        the current Database instance
      */
-    public function whereIsNotNull($field, $andOr = 'AND'){
-      if(is_array($field)){
-        foreach($field as $f){
+    public function whereIsNotNull($field, $andOr = 'AND') {
+      if (is_array($field)) {
+        foreach ($field as $f) {
           $this->whereIsNotNull($f, $andOr);
         }
       }
-      else{
-        if (! $this->where){
-          $this->where = $field.' IS NOT NULL ';
+      else {
+        if (!$this->where) {
+          $this->where = $field . ' IS NOT NULL ';
         }
-        else{
-            $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
+        else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' IS NOT NULL ';
           }
       }
       return $this;
@@ -498,24 +498,24 @@ 
      * @param  boolean $escape whether to escape or not the $val
      * @return object        the current Database instance
      */
-    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($where)){
+    public function where($where, $op = null, $val = null, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($where)) {
         $_where = array();
-        foreach ($where as $column => $data){
-          if(is_null($data)){
+        foreach ($where as $column => $data) {
+          if (is_null($data)) {
             $data = '';
           }
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
-        $where = implode(' '.$andOr.' ', $_where);
+        $where = implode(' ' . $andOr . ' ', $_where);
       }
-      else{
-        if(is_array($op)){
+      else {
+        if (is_array($op)) {
           $x = explode('?', $where);
           $w = '';
-          foreach($x as $k => $v){
-            if(! empty($v)){
-                if(isset($op[$k]) && is_null($op[$k])){
+          foreach ($x as $k => $v) {
+            if (!empty($v)) {
+                if (isset($op[$k]) && is_null($op[$k])) {
                   $op[$k] = '';
                 }
                 $w .= $type . $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -523,28 +523,28 @@ 
           }
           $where = $w;
         }
-        else if (! in_array((string)$op, $this->operatorList)){
-          if(is_null($op)){
+        else if (!in_array((string) $op, $this->operatorList)) {
+          if (is_null($op)) {
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
         }
-        else{
-          if(is_null($val)){
+        else {
+          if (is_null($val)) {
             $val = '';
           }
         	$where = $type . $where . $op . ($escape ? $this->escape($val) : $val);
         }
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $where;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $where;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $where;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $where;
         }
       }
       return $this;
@@ -555,7 +555,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orWhere($where, $op = null, $val = null, $escape = true){
+    public function orWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, '', 'OR', $escape);
     }
 
@@ -565,7 +565,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function notWhere($where, $op = null, $val = null, $escape = true){
+    public function notWhere($where, $op = null, $val = null, $escape = true) {
       return $this->where($where, $op, $val, 'NOT ', 'AND', $escape);
     }
 
@@ -574,7 +574,7 @@ 
      * @see  Database::where()
      * @return object        the current Database instance
      */
-    public function orNotWhere($where, $op = null, $val = null, $escape = true){
+    public function orNotWhere($where, $op = null, $val = null, $escape = true) {
     	return $this->where($where, $op, $val, 'NOT ', 'OR', $escape);
     }
 
@@ -584,15 +584,15 @@ 
      * @param  string $andOr the multiple conditions separator (AND, OR, etc.)
      * @return object        the current Database instance
      */
-    public function groupStart($type = '', $andOr = ' AND'){
-      if (is_null($this->where)){
+    public function groupStart($type = '', $andOr = ' AND') {
+      if (is_null($this->where)) {
         $this->where = $type . ' (';
       }
-      else{
-          if(substr($this->where, -1) == '('){
+      else {
+          if (substr($this->where, -1) == '(') {
             $this->where .= $type . ' (';
           }
-          else{
+          else {
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -604,7 +604,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function notGroupStart(){
+    public function notGroupStart() {
       return $this->groupStart('NOT');
     }
 
@@ -613,7 +613,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orGroupStart(){
+    public function orGroupStart() {
       return $this->groupStart('', ' OR');
     }
 
@@ -622,7 +622,7 @@ 
      * @see  Database::groupStart()
      * @return object        the current Database instance
      */
-    public function orNotGroupStart(){
+    public function orNotGroupStart() {
       return $this->groupStart('NOT', ' OR');
     }
 
@@ -630,7 +630,7 @@ 
      * Close the parenthesis for the grouped SQL
      * @return object        the current Database instance
      */
-    public function groupEnd(){
+    public function groupEnd() {
       $this->where .= ')';
       return $this;
     }
@@ -644,25 +644,25 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true){
-      if (is_array($keys)){
+    public function in($field, array $keys, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_array($keys)) {
         $_keys = array();
-        foreach ($keys as $k => $v){
-          if(is_null($v)){
+        foreach ($keys as $k => $v) {
+          if (is_null($v)) {
             $v = '';
           }
           $_keys[] = (is_numeric($v) ? $v : ($escape ? $this->escape($v) : $v));
         }
         $keys = implode(', ', $_keys);
-        if (is_null($this->where)){
+        if (is_null($this->where)) {
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
         }
-        else{
-          if(substr($this->where, -1) == '('){
-            $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+        else {
+          if (substr($this->where, -1) == '(') {
+            $this->where = $this->where . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
-          else{
-            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
+          else {
+            $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'IN (' . $keys . ')';
           }
         }
       }
@@ -674,7 +674,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function notIn($field, array $keys, $escape = true){
+    public function notIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'AND', $escape);
     }
 
@@ -683,7 +683,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orIn($field, array $keys, $escape = true){
+    public function orIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, '', 'OR', $escape);
     }
 
@@ -692,7 +692,7 @@ 
      * @see  Database::in()
      * @return object        the current Database instance
      */
-    public function orNotIn($field, array $keys, $escape = true){
+    public function orNotIn($field, array $keys, $escape = true) {
       return $this->in($field, $keys, 'NOT ', 'OR', $escape);
     }
 
@@ -706,21 +706,21 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($value1)){
+    public function between($field, $value1, $value2, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($value1)) {
         $value1 = '';
       }
-      if(is_null($value2)){
+      if (is_null($value2)) {
         $value2 = '';
       }
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
-        else{
+        else {
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -732,7 +732,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function notBetween($field, $value1, $value2, $escape = true){
+    public function notBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'AND', $escape);
     }
 
@@ -741,7 +741,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orBetween($field, $value1, $value2, $escape = true){
+    public function orBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, '', 'OR', $escape);
     }
 
@@ -750,7 +750,7 @@ 
      * @see  Database::between()
      * @return object        the current Database instance
      */
-    public function orNotBetween($field, $value1, $value2, $escape = true){
+    public function orNotBetween($field, $value1, $value2, $escape = true) {
       return $this->between($field, $value1, $value2, 'NOT ', 'OR', $escape);
     }
 
@@ -763,20 +763,20 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true){
-      if(is_null($data)){
+    public function like($field, $data, $type = '', $andOr = 'AND', $escape = true) {
+      if (is_null($data)) {
         $data = '';
       }
       $like = $escape ? $this->escape($data) : $data;
-      if (is_null($this->where)){
+      if (is_null($this->where)) {
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
       }
-      else{
-        if(substr($this->where, -1) == '('){
+      else {
+        if (substr($this->where, -1) == '(') {
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
-        else{
-          $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
+        else {
+          $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
       return $this;
@@ -787,7 +787,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orLike($field, $data, $escape = true){
+    public function orLike($field, $data, $escape = true) {
       return $this->like($field, $data, '', 'OR', $escape);
     }
 
@@ -796,7 +796,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function notLike($field, $data, $escape = true){
+    public function notLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'AND', $escape);
     }
 
@@ -805,7 +805,7 @@ 
      * @see  Database::like()
      * @return object        the current Database instance
      */
-    public function orNotLike($field, $data, $escape = true){
+    public function orNotLike($field, $data, $escape = true) {
       return $this->like($field, $data, 'NOT ', 'OR', $escape);
     }
 
@@ -816,14 +816,14 @@ 
      * @param  int $limitEnd the limit count
      * @return object        the current Database instance
      */
-    public function limit($limit, $limitEnd = null){
-      if(is_null($limit)){
+    public function limit($limit, $limitEnd = null) {
+      if (is_null($limit)) {
         return;
       }
-      if (! is_null($limitEnd)){
+      if (!is_null($limitEnd)) {
         $this->limit = $limit . ', ' . $limitEnd;
       }
-      else{
+      else {
         $this->limit = $limit;
       }
       return $this;
@@ -835,16 +835,16 @@ 
      * @param  string $orderDir the order direction (ASC or DESC)
      * @return object        the current Database instance
      */
-    public function orderBy($orderBy, $orderDir = ' ASC'){
-      if (! is_null($orderDir)){
-        $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
+    public function orderBy($orderBy, $orderDir = ' ASC') {
+      if (!is_null($orderDir)) {
+        $this->orderBy = !$this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
       }
-      else{
-        if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
-          $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
+      else {
+        if (stristr($orderBy, ' ') || $orderBy == 'rand()') {
+          $this->orderBy = !$this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
         }
-        else{
-          $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
+        else {
+          $this->orderBy = !$this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
       return $this;
@@ -855,11 +855,11 @@ 
      * @param  string|array $field the field name used or array of field list
      * @return object        the current Database instance
      */
-    public function groupBy($field){
-      if(is_array($field)){
+    public function groupBy($field) {
+      if (is_array($field)) {
         $this->groupBy = implode(', ', $field);
       }
-      else{
+      else {
         $this->groupBy = $field;
       }
       return $this;
@@ -873,13 +873,13 @@ 
      * @param  boolean $escape whether to escape or not the values
      * @return object        the current Database instance
      */
-    public function having($field, $op = null, $val = null, $escape = true){
-      if(is_array($op)){
+    public function having($field, $op = null, $val = null, $escape = true) {
+      if (is_array($op)) {
         $x = explode('?', $field);
         $w = '';
-        foreach($x as $k => $v){
-  	      if(!empty($v)){
-            if(isset($op[$k]) && is_null($op[$k])){
+        foreach ($x as $k => $v) {
+  	      if (!empty($v)) {
+            if (isset($op[$k]) && is_null($op[$k])) {
               $op[$k] = '';
             }
   	      	$w .= $v . (isset($op[$k]) ? ($escape ? $this->escape($op[$k]) : $op[$k]) : '');
@@ -887,14 +887,14 @@ 
       	}
         $this->having = $w;
       }
-      else if (! in_array($op, $this->operatorList)){
-        if(is_null($op)){
+      else if (!in_array($op, $this->operatorList)) {
+        if (is_null($op)) {
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
       }
-      else{
-        if(is_null($val)){
+      else {
+        if (is_null($val)) {
           $val = '';
         }
         $this->having = $field . ' ' . $op . ' ' . ($escape ? $this->escape($val) : $val);
@@ -906,7 +906,7 @@ 
      * Return the number of rows returned by the current query
      * @return int
      */
-    public function numRows(){
+    public function numRows() {
       return $this->numRows;
     }
 
@@ -914,15 +914,15 @@ 
      * Return the last insert id value
      * @return mixed
      */
-    public function insertId(){
+    public function insertId() {
       return $this->insertId;
     }
 
     /**
      * Show an error got from the current query (SQL command synthax error, database driver returned error, etc.)
      */
-    public function error(){
-  		if($this->error){
+    public function error() {
+  		if ($this->error) {
   			show_error('Query: "' . $this->query . '" Error: ' . $this->error, 'Database Error');
   		}
     }
@@ -933,14 +933,14 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function get($returnSQLQueryOrResultType = false){
+    public function get($returnSQLQueryOrResultType = false) {
       $this->limit = 1;
       $query = $this->getAll(true);
-      if($returnSQLQueryOrResultType === true){
+      if ($returnSQLQueryOrResultType === true) {
         return $query;
       }
-      else{
-        return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+        return $this->query($query, false, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -950,37 +950,37 @@ 
      * If is string will determine the result type "array" or "object"
      * @return mixed       the query SQL string or the record result
      */
-    public function getAll($returnSQLQueryOrResultType = false){
+    public function getAll($returnSQLQueryOrResultType = false) {
       $query = 'SELECT ' . $this->select . ' FROM ' . $this->from;
-      if (! is_null($this->join)){
+      if (!is_null($this->join)) {
         $query .= $this->join;
       }
 	  
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->groupBy)){
+      if (!is_null($this->groupBy)) {
         $query .= ' GROUP BY ' . $this->groupBy;
       }
 
-      if (! is_null($this->having)){
+      if (!is_null($this->having)) {
         $query .= ' HAVING ' . $this->having;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
           $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if(! is_null($this->limit)){
+      if (!is_null($this->limit)) {
       	$query .= ' LIMIT ' . $this->limit;
       }
 	  
-	  if($returnSQLQueryOrResultType === true){
+	  if ($returnSQLQueryOrResultType === true) {
     	return $query;
       }
-      else{
-    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
+      else {
+    	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false));
       }
     }
 
@@ -990,15 +990,15 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the insert id of the new record or null
      */
-    public function insert($data = array(), $escape = true){
+    public function insert($data = array(), $escape = true) {
       $column = array();
       $val = array();
-      if(! $data && $this->getData()){
+      if (!$data && $this->getData()) {
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
       }
-      else{
+      else {
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1007,14 +1007,14 @@ 
       $query = 'INSERT INTO ' . $this->from . ' (' . $column . ') VALUES (' . $val . ')';
       $query = $this->query($query);
 
-      if ($query){
-        if(! $this->pdo){
+      if ($query) {
+        if (!$this->pdo) {
           $this->connect();
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
       }
-      else{
+      else {
 		  return false;
       }
     }
@@ -1025,29 +1025,29 @@ 
      * @param  boolean $escape  whether to escape or not the values
      * @return mixed          the update status
      */
-    public function update($data = array(), $escape = true){
+    public function update($data = array(), $escape = true) {
       $query = 'UPDATE ' . $this->from . ' SET ';
       $values = array();
-      if(! $data && $this->getData()){
-        foreach ($this->getData() as $column => $val){
+      if (!$data && $this->getData()) {
+        foreach ($this->getData() as $column => $val) {
           $values[] = $column . ' = ' . $val;
         }
       }
-      else{
-        foreach ($data as $column => $val){
+      else {
+        foreach ($data as $column => $val) {
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
       }
       $query .= (is_array($data) ? implode(', ', $values) : $data);
-      if (! is_null($this->where)){
+      if (!is_null($this->where)) {
         $query .= ' WHERE ' . $this->where;
       }
 
-      if (! is_null($this->orderBy)){
+      if (!is_null($this->orderBy)) {
         $query .= ' ORDER BY ' . $this->orderBy;
       }
 
-      if (! is_null($this->limit)){
+      if (!is_null($this->limit)) {
         $query .= ' LIMIT ' . $this->limit;
       }
       return $this->query($query);
@@ -1057,22 +1057,22 @@ 
      * Delete the record in database
      * @return mixed the delete status
      */
-    public function delete(){
+    public function delete() {
     	$query = 'DELETE FROM ' . $this->from;
 
-    	if (! is_null($this->where)){
+    	if (!is_null($this->where)) {
     		$query .= ' WHERE ' . $this->where;
       	}
 
-    	if (! is_null($this->orderBy)){
+    	if (!is_null($this->orderBy)) {
     	  $query .= ' ORDER BY ' . $this->orderBy;
       	}
 
-    	if (! is_null($this->limit)){
+    	if (!is_null($this->limit)) {
     		$query .= ' LIMIT ' . $this->limit;
       	}
 
-    	if($query == 'DELETE FROM ' . $this->from){
+    	if ($query == 'DELETE FROM ' . $this->from) {
     		$query = 'TRUNCATE TABLE ' . $this->from;
       	}
     	return $this->query($query);
@@ -1085,13 +1085,13 @@ 
      * @param  boolean $array return the result as array
      * @return mixed         the query result
      */
-    public function query($query, $all = true, $array = false){
+    public function query($query, $all = true, $array = false) {
       $this->reset();
-      if(is_array($all)){
+      if (is_array($all)) {
         $x = explode('?', $query);
         $q = '';
-        foreach($x as $k => $v){
-          if(! empty($v)){
+        foreach ($x as $k => $v) {
+          if (!empty($v)) {
             $q .= $v . (isset($all[$k]) ? $this->escape($all[$k]) : '');
           }
         }
@@ -1100,7 +1100,7 @@ 
 
       $this->query = preg_replace('/\s\s+|\t\t+/', ' ', trim($query));
       $sqlSELECTQuery = stristr($this->query, 'SELECT');
-      $this->logger->info('Execute SQL query ['.$this->query.'], return type: ' . ($array?'ARRAY':'OBJECT') .', return as list: ' . ($all ? 'YES':'NO'));
+      $this->logger->info('Execute SQL query [' . $this->query . '], return type: ' . ($array ? 'ARRAY' : 'OBJECT') . ', return as list: ' . ($all ? 'YES' : 'NO'));
       //cache expire time
   	  $cacheExpire = $this->temporaryCacheTtl;
   	  
@@ -1122,34 +1122,34 @@ 
   	  //if can use cache feature for this query
   	  $dbCacheStatus = $cacheEnable && $cacheExpire > 0;
 	  
-      if ($dbCacheStatus && $sqlSELECTQuery){
+      if ($dbCacheStatus && $sqlSELECTQuery) {
         $this->logger->info('The cache is enabled for this query, try to get result from cache'); 
         $cacheKey = md5($query . $all . $array);
-        if(is_object($this->cacheInstance)){
+        if (is_object($this->cacheInstance)) {
           $cacheInstance = $this->cacheInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
       }
-      else{
+      else {
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       
-      if (! $cacheContent && $sqlSELECTQuery){
+      if (!$cacheContent && $sqlSELECTQuery) {
 		    //for database query execution time
         $benchmarkMarkerKey = md5($query . $all . $array);
         $bench = null;
-        if(is_object($this->benchmarkInstance)){
+        if (is_object($this->benchmarkInstance)) {
           $bench = $this->benchmarkInstance;
         }
-        else{
+        else {
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1160,52 +1160,52 @@ 
     		//get response time for this query
         $responseTime = $bench->elapsedTime('DATABASE_QUERY_START(' . $benchmarkMarkerKey . ')', 'DATABASE_QUERY_END(' . $benchmarkMarkerKey . ')');
 	     	//TODO use the configuration value for the high response time currently is 1 second
-        if($responseTime >= 1 ){
-            $this->logger->warning('High response time while processing database query [' .$query. ']. The response time is [' .$responseTime. '] sec.');
+        if ($responseTime >= 1) {
+            $this->logger->warning('High response time while processing database query [' . $query . ']. The response time is [' . $responseTime . '] sec.');
         }
-        if ($sqlQuery){
+        if ($sqlQuery) {
           $this->numRows = $sqlQuery->rowCount();
-          if (($this->numRows > 0)){
+          if (($this->numRows > 0)) {
 		    	//if need return all result like list of record
-            if ($all){
+            if ($all) {
     				$this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
     		    }
-            else{
+            else {
 				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
           }
-          if ($dbCacheStatus && $sqlSELECTQuery){
-            $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
+          if ($dbCacheStatus && $sqlSELECTQuery) {
+            $this->logger->info('Save the result for query [' . $this->query . '] into cache for future use');
             $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
         }
-        else{
+        else {
           $error = $this->pdo->errorInfo();
           $this->error = $error[2];
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      else if ((!$cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)) {
     		$queryStr = $this->pdo->query($this->query);
-    		if($queryStr){
+    		if ($queryStr) {
     			$this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
     			$this->numRows = $queryStr->rowCount();
     		}
-        if (! $this->result){
+        if (!$this->result) {
           $error = $this->pdo->errorInfo();
           $this->error = $error[2];
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
       }
-      else{
-        $this->logger->info('The result for query [' .$this->query. '] already cached use it');
+      else {
+        $this->logger->info('The result for query [' . $this->query . '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);
       }
       $this->queryCount++;
-      if(! $this->result){
+      if (!$this->result) {
         $this->logger->info('No result where found for the query [' . $query . ']');
       }
       return $this->result;
@@ -1216,8 +1216,8 @@ 
      * @param integer $ttl the cache time to live in second
      * @return object        the current Database instance
      */
-    public function setCache($ttl = 0){
-      if($ttl > 0){
+    public function setCache($ttl = 0) {
+      if ($ttl > 0) {
         $this->cacheTtl = $ttl;
 		    $this->temporaryCacheTtl = $ttl;
       }
@@ -1229,8 +1229,8 @@ 
 	 * @param  integer $ttl the cache time to live in second
 	 * @return object        the current Database instance
 	 */
-	public function cached($ttl = 0){
-      if($ttl > 0){
+	public function cached($ttl = 0) {
+      if ($ttl > 0) {
         $this->temporaryCacheTtl = $ttl;
       }
 	  return $this;
@@ -1241,11 +1241,11 @@ 
      * @param  mixed $data the data to be escaped
      * @return mixed       the data after escaped
      */
-    public function escape($data){
-      if(is_null($data)){
+    public function escape($data) {
+      if (is_null($data)) {
         return null;
       }
-      if(! $this->pdo){
+      if (!$this->pdo) {
         $this->connect();
       }
       return $this->pdo->quote(trim($data));
@@ -1255,7 +1255,7 @@ 
      * Return the number query executed count for the current request
      * @return int
      */
-    public function queryCount(){
+    public function queryCount() {
       return $this->queryCount;
     }
 
@@ -1263,7 +1263,7 @@ 
      * Return the current query SQL string
      * @return string
      */
-    public function getQuery(){
+    public function getQuery() {
       return $this->query;
     }
 
@@ -1271,7 +1271,7 @@ 
      * Return the application database name
      * @return string
      */
-    public function getDatabaseName(){
+    public function getDatabaseName() {
       return $this->databaseName;
     }
 
@@ -1279,7 +1279,7 @@ 
      * Return the database configuration
      * @return array
      */
-    public  function getDatabaseConfiguration(){
+    public  function getDatabaseConfiguration() {
       return $this->config;
     }
 
@@ -1287,7 +1287,7 @@ 
      * set the database configuration
      * @param array $config the configuration
      */
-    public function setDatabaseConfiguration(array $config){
+    public function setDatabaseConfiguration(array $config) {
       $this->config = array_merge($this->config, $config);
       $this->prefix = $this->config['prefix'];
       $this->databaseName = $this->config['database'];
@@ -1299,7 +1299,7 @@ 
      * Return the PDO instance
      * @return PDO
      */
-    public function getPdo(){
+    public function getPdo() {
       return $this->pdo;
     }
 
@@ -1307,7 +1307,7 @@ 
      * Set the PDO instance
      * @param PDO $pdo the pdo object
      */
-    public function setPdo(PDO $pdo){
+    public function setPdo(PDO $pdo) {
       $this->pdo = $pdo;
       return $this;
     }
@@ -1317,7 +1317,7 @@ 
      * Return the Log instance
      * @return Log
      */
-    public function getLogger(){
+    public function getLogger() {
       return $this->logger;
     }
 
@@ -1325,7 +1325,7 @@ 
      * Set the log instance
      * @param Log $logger the log object
      */
-    public function setLogger($logger){
+    public function setLogger($logger) {
       $this->logger = $logger;
       return $this;
     }
@@ -1334,7 +1334,7 @@ 
      * Return the cache instance
      * @return CacheInterface
      */
-    public function getCacheInstance(){
+    public function getCacheInstance() {
       return $this->cacheInstance;
     }
 
@@ -1342,7 +1342,7 @@ 
      * Set the cache instance
      * @param CacheInterface $cache the cache object
      */
-    public function setCacheInstance($cache){
+    public function setCacheInstance($cache) {
       $this->cacheInstance = $cache;
       return $this;
     }
@@ -1351,7 +1351,7 @@ 
      * Return the benchmark instance
      * @return Benchmark
      */
-    public function getBenchmark(){
+    public function getBenchmark() {
       return $this->benchmarkInstance;
     }
 
@@ -1359,7 +1359,7 @@ 
      * Set the benchmark instance
      * @param Benchmark $cache the cache object
      */
-    public function setBenchmark($benchmark){
+    public function setBenchmark($benchmark) {
       $this->benchmarkInstance = $benchmark;
       return $this;
     }
@@ -1368,7 +1368,7 @@ 
      * Return the data to be used for insert, update, etc.
      * @return array
      */
-    public function getData(){
+    public function getData() {
       return $this->data;
     }
 
@@ -1379,7 +1379,7 @@ 
      * @param boolean $escape whether to escape or not the $value
      * @return object        the current Database instance
      */
-    public function setData($key, $value, $escape = true){
+    public function setData($key, $value, $escape = true) {
       $this->data[$key] = $escape ? $this->escape($value) : $value;
       return $this;
     }
@@ -1388,7 +1388,7 @@ 
   /**
    * Reset the database class attributs to the initail values before each query.
    */
-  private function reset(){
+  private function reset() {
     $this->select   = '*';
     $this->from     = null;
     $this->where    = null;
@@ -1408,7 +1408,7 @@ 
   /**
    * The class destructor
    */
-  function __destruct(){
+  function __destruct() {
     $this->pdo = null;
   }
 

Braces +42 added lines, -84 removed lines

@@ -188,8 +188,7 @@ 
          */
         if(is_object($logger)){
           $this->logger = $logger;
-        }
-        else{
+        } else{
             $this->logger =& class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Database');
         }
@@ -236,11 +235,9 @@ 
                 $dsn = $config['driver'] . ':host=' . $config['hostname'] . ';'
                 . (($config['port']) != '' ? 'port=' . $config['port'] . ';' : '')
                 . 'dbname=' . $config['database'];
-            }
-            else if ($config['driver'] == 'sqlite'){
+            } else if ($config['driver'] == 'sqlite'){
               $dsn = 'sqlite:' . $config['database'];
-            }
-            else if($config['driver'] == 'oracle'){
+            } else if($config['driver'] == 'oracle'){
               $dsn = 'oci:dbname=' . $config['host'] . '/' . $config['database'];
             }
             
@@ -249,14 +246,12 @@ 
             $this->pdo->exec("SET CHARACTER SET '" . $config['charset'] . "'");
             $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
             return true;
-          }
-          catch (PDOException $e){
+          } catch (PDOException $e){
             $this->logger->fatal($e->getMessage());
             show_error('Cannot connect to Database.');
             return false;
           }
-      }
-      else{
+      } else{
         show_error('Database configuration is not set.');
         return false;
       }
@@ -274,8 +269,7 @@ 
           $froms .= $this->prefix . $key . ', ';
         }
         $this->from = rtrim($froms, ', ');
-      }
-      else{
+      } else{
         $this->from = $this->prefix . $table;
       }
       return $this;
@@ -381,8 +375,7 @@ 
       }
       if (is_null($this->join)){
         $this->join = ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
-      }
-      else{
+      } else{
         $this->join = $this->join . ' ' . $type . 'JOIN' . ' ' . $table . ' ON ' . $on;
       }
       return $this;
@@ -453,12 +446,10 @@ 
         foreach($field as $f){
         	$this->whereIsNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NULL ';
           }
       }
@@ -476,12 +467,10 @@ 
         foreach($field as $f){
           $this->whereIsNotNull($f, $andOr);
         }
-      }
-      else{
+      } else{
         if (! $this->where){
           $this->where = $field.' IS NOT NULL ';
-        }
-        else{
+        } else{
             $this->where = $this->where . ' '.$andOr.' ' . $field.' IS NOT NULL ';
           }
       }
@@ -508,8 +497,7 @@ 
           $_where[] = $type . $column . '=' . ($escape ? $this->escape($data) : $data);
         }
         $where = implode(' '.$andOr.' ', $_where);
-      }
-      else{
+      } else{
         if(is_array($op)){
           $x = explode('?', $where);
           $w = '';
@@ -522,14 +510,12 @@ 
             }
           }
           $where = $w;
-        }
-        else if (! in_array((string)$op, $this->operatorList)){
+        } else if (! in_array((string)$op, $this->operatorList)){
           if(is_null($op)){
             $op = '';
           }
         	$where = $type . $where . ' = ' . ($escape ? $this->escape($op) : $op);
-        }
-        else{
+        } else{
           if(is_null($val)){
             $val = '';
           }
@@ -538,12 +524,10 @@ 
       }
       if (is_null($this->where)){
         $this->where = $where;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $where;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $where;
         }
       }
@@ -587,12 +571,10 @@ 
     public function groupStart($type = '', $andOr = ' AND'){
       if (is_null($this->where)){
         $this->where = $type . ' (';
-      }
-      else{
+      } else{
           if(substr($this->where, -1) == '('){
             $this->where .= $type . ' (';
-          }
-          else{
+          } else{
           	$this->where .= $andOr . ' ' . $type . ' (';
           }
       }
@@ -656,12 +638,10 @@ 
         $keys = implode(', ', $_keys);
         if (is_null($this->where)){
           $this->where = $field . ' ' . $type . 'IN (' . $keys . ')';
-        }
-        else{
+        } else{
           if(substr($this->where, -1) == '('){
             $this->where = $this->where . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
-          }
-          else{
+          } else{
             $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' '.$type.'IN (' . $keys . ')';
           }
         }
@@ -715,12 +695,10 @@ 
       }
       if (is_null($this->where)){
       	$this->where = $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
-        }
-        else{
+        } else{
           $this->where = $this->where . ' ' . $andOr . ' ' . $field . ' ' . $type . 'BETWEEN ' . ($escape ? $this->escape($value1) : $value1) . ' AND ' . ($escape ? $this->escape($value2) : $value2);
         }
       }
@@ -770,12 +748,10 @@ 
       $like = $escape ? $this->escape($data) : $data;
       if (is_null($this->where)){
         $this->where = $field . ' ' . $type . 'LIKE ' . $like;
-      }
-      else{
+      } else{
         if(substr($this->where, -1) == '('){
           $this->where = $this->where . ' ' . $field . ' ' . $type . 'LIKE ' . $like;
-        }
-        else{
+        } else{
           $this->where = $this->where . ' '.$andOr.' ' . $field . ' ' . $type . 'LIKE ' . $like;
         }
       }
@@ -822,8 +798,7 @@ 
       }
       if (! is_null($limitEnd)){
         $this->limit = $limit . ', ' . $limitEnd;
-      }
-      else{
+      } else{
         $this->limit = $limit;
       }
       return $this;
@@ -838,12 +813,10 @@ 
     public function orderBy($orderBy, $orderDir = ' ASC'){
       if (! is_null($orderDir)){
         $this->orderBy = ! $this->orderBy ? ($orderBy . ' ' . strtoupper($orderDir)) : $this->orderBy . ', ' . $orderBy . ' ' . strtoupper($orderDir);
-      }
-      else{
+      } else{
         if(stristr($orderBy, ' ') || $orderBy == 'rand()'){
           $this->orderBy = ! $this->orderBy ? $orderBy : $this->orderBy . ', ' . $orderBy;
-        }
-        else{
+        } else{
           $this->orderBy = ! $this->orderBy ? ($orderBy . ' ASC') : $this->orderBy . ', ' . ($orderBy . ' ASC');
         }
       }
@@ -858,8 +831,7 @@ 
     public function groupBy($field){
       if(is_array($field)){
         $this->groupBy = implode(', ', $field);
-      }
-      else{
+      } else{
         $this->groupBy = $field;
       }
       return $this;
@@ -886,14 +858,12 @@ 
   	      }
       	}
         $this->having = $w;
-      }
-      else if (! in_array($op, $this->operatorList)){
+      } else if (! in_array($op, $this->operatorList)){
         if(is_null($op)){
           $op = '';
         }
         $this->having = $field . ' > ' . ($escape ? $this->escape($op) : $op);
-      }
-      else{
+      } else{
         if(is_null($val)){
           $val = '';
         }
@@ -938,8 +908,7 @@ 
       $query = $this->getAll(true);
       if($returnSQLQueryOrResultType === true){
         return $query;
-      }
-      else{
+      } else{
         return $this->query( $query, false, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -978,8 +947,7 @@ 
 	  
 	  if($returnSQLQueryOrResultType === true){
     	return $query;
-      }
-      else{
+      } else{
     	return $this->query($query, true, (($returnSQLQueryOrResultType == 'array') ? true : false) );
       }
     }
@@ -997,8 +965,7 @@ 
         $columns = array_keys($this->getData());
         $column = implode(',', $columns);
         $val = implode(', ', $this->getData());
-      }
-      else{
+      } else{
         $columns = array_keys($data);
         $column = implode(',', $columns);
         $val = implode(', ', ($escape ? array_map(array($this, 'escape'), $data) : $data));
@@ -1013,8 +980,7 @@ 
         }
         $this->insertId = $this->pdo->lastInsertId();
         return $this->insertId();
-      }
-      else{
+      } else{
 		  return false;
       }
     }
@@ -1032,8 +998,7 @@ 
         foreach ($this->getData() as $column => $val){
           $values[] = $column . ' = ' . $val;
         }
-      }
-      else{
+      } else{
         foreach ($data as $column => $val){
           $values[] = $column . '=' . ($escape ? $this->escape($val) : $val);
         }
@@ -1127,14 +1092,12 @@ 
         $cacheKey = md5($query . $all . $array);
         if(is_object($this->cacheInstance)){
           $cacheInstance = $this->cacheInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $cacheInstance = $obj->cache;  
         }
         $cacheContent = $cacheInstance->get($cacheKey);        
-      }
-      else{
+      } else{
 		  $this->logger->info('The cache is not enabled for this query or is not the SELECT query, get the result directly from real database');
       }
 
@@ -1148,8 +1111,7 @@ 
         $bench = null;
         if(is_object($this->benchmarkInstance)){
           $bench = $this->benchmarkInstance;
-        }
-        else{
+        } else{
           $obj = & get_instance();
           $bench = $obj->benchmark;  
         }
@@ -1169,8 +1131,7 @@ 
 		    	//if need return all result like list of record
             if ($all){
     				$this->result = ($array == false) ? $sqlQuery->fetchAll(PDO::FETCH_OBJ) : $sqlQuery->fetchAll(PDO::FETCH_ASSOC);
-    		    }
-            else{
+    		    } else{
 				        $this->result = ($array == false) ? $sqlQuery->fetch(PDO::FETCH_OBJ) : $sqlQuery->fetch(PDO::FETCH_ASSOC);
             }
           }
@@ -1178,15 +1139,13 @@ 
             $this->logger->info('Save the result for query [' .$this->query. '] into cache for future use');
             $cacheInstance->set($cacheKey, $this->result, $cacheExpire);
           }
-        }
-        else{
+        } else{
           $error = $this->pdo->errorInfo();
           $this->error = $error[2];
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
+      } else if ((! $cacheContent && !$sqlSELECTQuery) || ($cacheContent && !$sqlSELECTQuery)){
     		$queryStr = $this->pdo->query($this->query);
     		if($queryStr){
     			$this->result = $queryStr->rowCount() >= 0; //to test the result for the query like UPDATE, INSERT, DELETE
@@ -1198,8 +1157,7 @@ 
           $this->logger->fatal('The database query execution got error: ' . stringfy_vars($error));
           $this->error();
         }
-      }
-      else{
+      } else{
         $this->logger->info('The result for query [' .$this->query. '] already cached use it');
         $this->result = $cacheContent;
 	     	$this->numRows = count($this->result);