adamjakab / SuiteCRM

include/database/DBManager.php

Indentation +3266 added lines, -3266 removed lines

@@ -97,389 +97,389 @@ 
  */
 abstract class DBManager
 {
-	/**
-	 * Name of database
-	 * @var resource
-	 */
-	public $database = null;
-
-	/**
-	 * Indicates whether we should die when we get an error from the DB
-	 */
-	protected $dieOnError = false;
-
-	/**
-	 * Indicates whether we should html encode the results from a query by default
-	 */
-	protected $encode = true;
-
-	/**
-	 * Records the execution time of the last query
-	 */
-	protected $query_time = 0;
-
-	/**
-	 * Last error message from the DB backend
-	 */
-	protected $last_error = false;
-
-	/**
-	 * Registry of available result sets
-	 */
-	protected $lastResult;
-
-	/**
-	 * Current query count
-	 */
-	private static $queryCount = 0;
-
-	/**
-	 * Query threshold limit
-	 */
-	private static $queryLimit = 0;
-
-	/**
-	 * Array of prepared statements and their correspoding parsed tokens
-	 */
-	protected $preparedTokens = array();
-
-	/**
-	 * TimeDate instance
-	 * @var TimeDate
-	 */
-	protected $timedate;
-
-	/**
-	 * PHP Logger
-	 * @var Logger
-	 */
-	protected $log;
-
-	/**
-	 * Table descriptions
-	 * @var array
-	 */
-	protected static $table_descriptions = array();
-
-	/**
-	 * Index descriptions
-	 * @var array
-	 */
-	protected static $index_descriptions = array();
-
-	/**
-	 * Maximum length of identifiers
-	 * @abstract
-	 * @var array
-	 */
-	protected $maxNameLengths = array(
-		'table' => 64,
-		'column' => 64,
-		'index' => 64,
-		'alias' => 64
-	);
-
-	/**
-	 * DB driver priority
-	 * Higher priority drivers override lower priority ones
-	 * @var int
-	 */
-	public $priority = 0;
-
-	/**
-	 * Driver name label, for install
-	 * @absrtact
-	 * @var string
-	 */
-	public $label = '';
-
-	/**
-	 * Type names map
-	 * @abstract
-	 * @var array
-	 */
-	protected $type_map = array();
-
-	/**
-	 * Type classification into:
-	 * - int
-	 * - bool
-	 * - float
-	 * - date
-	 * @abstract
-	 * @var array
-	 */
-	protected $type_class = array(
-			'int'      => 'int',
-			'double'   => 'float',
-			'float'    => 'float',
-			'uint'     => 'int',
-			'ulong'    => 'bigint',
-			'long'     => 'bigint',
-			'short'    => 'int',
-			'date'     => 'date',
-			'datetime' => 'date',
-			'datetimecombo' => 'date',
-			'time'     => 'time',
-			'bool'     => 'bool',
-			'tinyint'  => 'int',
-			'currency' => 'float',
-			'decimal'  => 'float',
-			'decimal2' => 'float',
-	);
-
-	/**
-	 * Capabilities this DB supports. Supported list:
-	 * affected_rows	Can report query affected rows for UPDATE/DELETE
-	 * 					implement getAffectedRowCount()
-	 * select_rows		Can report row count for SELECT
-	 * 					implement getRowCount()
-	 * case_sensitive	Supports case-sensitive text columns
-	 * fulltext			Supports fulltext search indexes
-	 * inline_keys		Supports defining keys together with the table
-	 * auto_increment_sequence Autoincrement support implemented as sequence
-	 * limit_subquery   Supports LIMIT clauses in subqueries
-	 * create_user		Can create users for Sugar
-	 * create_db		Can create databases
-	 * collation		Supports setting collations
-	 * disable_keys     Supports temporarily disabling keys (for upgrades, etc.)
-	 *
-	 * @abstract
-	 * Special cases:
-	 * fix:expandDatabase - needs expandDatabase fix, see expandDatabase.php
-	 * TODO: verify if we need these cases
-	 */
-	protected $capabilities = array();
-
-	/**
-	 * Database options
-	 * @var array
-	 */
-	protected $options = array();
+    /**
+     * Name of database
+     * @var resource
+     */
+    public $database = null;
+
+    /**
+     * Indicates whether we should die when we get an error from the DB
+     */
+    protected $dieOnError = false;
+
+    /**
+     * Indicates whether we should html encode the results from a query by default
+     */
+    protected $encode = true;
+
+    /**
+     * Records the execution time of the last query
+     */
+    protected $query_time = 0;
+
+    /**
+     * Last error message from the DB backend
+     */
+    protected $last_error = false;
+
+    /**
+     * Registry of available result sets
+     */
+    protected $lastResult;
+
+    /**
+     * Current query count
+     */
+    private static $queryCount = 0;
+
+    /**
+     * Query threshold limit
+     */
+    private static $queryLimit = 0;
+
+    /**
+     * Array of prepared statements and their correspoding parsed tokens
+     */
+    protected $preparedTokens = array();
+
+    /**
+     * TimeDate instance
+     * @var TimeDate
+     */
+    protected $timedate;
+
+    /**
+     * PHP Logger
+     * @var Logger
+     */
+    protected $log;
+
+    /**
+     * Table descriptions
+     * @var array
+     */
+    protected static $table_descriptions = array();
+
+    /**
+     * Index descriptions
+     * @var array
+     */
+    protected static $index_descriptions = array();
+
+    /**
+     * Maximum length of identifiers
+     * @abstract
+     * @var array
+     */
+    protected $maxNameLengths = array(
+        'table' => 64,
+        'column' => 64,
+        'index' => 64,
+        'alias' => 64
+    );
+
+    /**
+     * DB driver priority
+     * Higher priority drivers override lower priority ones
+     * @var int
+     */
+    public $priority = 0;
+
+    /**
+     * Driver name label, for install
+     * @absrtact
+     * @var string
+     */
+    public $label = '';
+
+    /**
+     * Type names map
+     * @abstract
+     * @var array
+     */
+    protected $type_map = array();
+
+    /**
+     * Type classification into:
+     * - int
+     * - bool
+     * - float
+     * - date
+     * @abstract
+     * @var array
+     */
+    protected $type_class = array(
+            'int'      => 'int',
+            'double'   => 'float',
+            'float'    => 'float',
+            'uint'     => 'int',
+            'ulong'    => 'bigint',
+            'long'     => 'bigint',
+            'short'    => 'int',
+            'date'     => 'date',
+            'datetime' => 'date',
+            'datetimecombo' => 'date',
+            'time'     => 'time',
+            'bool'     => 'bool',
+            'tinyint'  => 'int',
+            'currency' => 'float',
+            'decimal'  => 'float',
+            'decimal2' => 'float',
+    );
+
+    /**
+     * Capabilities this DB supports. Supported list:
+     * affected_rows	Can report query affected rows for UPDATE/DELETE
+     * 					implement getAffectedRowCount()
+     * select_rows		Can report row count for SELECT
+     * 					implement getRowCount()
+     * case_sensitive	Supports case-sensitive text columns
+     * fulltext			Supports fulltext search indexes
+     * inline_keys		Supports defining keys together with the table
+     * auto_increment_sequence Autoincrement support implemented as sequence
+     * limit_subquery   Supports LIMIT clauses in subqueries
+     * create_user		Can create users for Sugar
+     * create_db		Can create databases
+     * collation		Supports setting collations
+     * disable_keys     Supports temporarily disabling keys (for upgrades, etc.)
+     *
+     * @abstract
+     * Special cases:
+     * fix:expandDatabase - needs expandDatabase fix, see expandDatabase.php
+     * TODO: verify if we need these cases
+     */
+    protected $capabilities = array();
+
+    /**
+     * Database options
+     * @var array
+     */
+    protected $options = array();
 
     /**
      * Create DB Driver
      */
-	public function __construct()
-	{
-		$this->timedate = TimeDate::getInstance();
-		$this->log = isset($GLOBALS['log']) ? $GLOBALS['log'] : null;
-		$this->helper = $this; // compatibility
-	}
+    public function __construct()
+    {
+        $this->timedate = TimeDate::getInstance();
+        $this->log = isset($GLOBALS['log']) ? $GLOBALS['log'] : null;
+        $this->helper = $this; // compatibility
+    }
 
     /**
      * Wrapper for those trying to access the private and protected class members directly
      * @param string $p var name
      * @return mixed
      */
-	public function __get($p)
-	{
-		$this->log->info('Call to DBManager::$'.$p.' is deprecated');
-		return $this->$p;
-	}
-
-	/**
-	 * Returns the current database handle
-	 * @return resource
-	 */
-	public function getDatabase()
-	{
-		$this->checkConnection();
-		return $this->database;
-	}
-
-	/**
-	 * Returns this instance's DBHelper
-	 * Actually now returns $this
-	 * @deprecated
-	 * @return DBManager
-	 */
-	public function getHelper()
-	{
-		return $this;
-	}
-
-	/**
-	 * Checks for error happening in the database
-	 *
-	 * @param  string $msg        message to prepend to the error message
-	 * @param  bool   $dieOnError true if we want to die immediately on error
-	 * @return bool True if there was an error
-	 */
-	public function checkError($msg = '', $dieOnError = false)
-	{
-		if (empty($this->database)) {
-			$this->registerError($msg, "Database Is Not Connected", $dieOnError);
-			return true;
-		}
-
-		$dberror = $this->lastDbError();
-		if($dberror === false) {
-    		$this->last_error = false;
-	    	return false;
-		}
-		$this->registerError($msg, $dberror, $dieOnError);
+    public function __get($p)
+    {
+        $this->log->info('Call to DBManager::$'.$p.' is deprecated');
+        return $this->$p;
+    }
+
+    /**
+     * Returns the current database handle
+     * @return resource
+     */
+    public function getDatabase()
+    {
+        $this->checkConnection();
+        return $this->database;
+    }
+
+    /**
+     * Returns this instance's DBHelper
+     * Actually now returns $this
+     * @deprecated
+     * @return DBManager
+     */
+    public function getHelper()
+    {
+        return $this;
+    }
+
+    /**
+     * Checks for error happening in the database
+     *
+     * @param  string $msg        message to prepend to the error message
+     * @param  bool   $dieOnError true if we want to die immediately on error
+     * @return bool True if there was an error
+     */
+    public function checkError($msg = '', $dieOnError = false)
+    {
+        if (empty($this->database)) {
+            $this->registerError($msg, "Database Is Not Connected", $dieOnError);
+            return true;
+        }
+
+        $dberror = $this->lastDbError();
+        if($dberror === false) {
+            $this->last_error = false;
+            return false;
+        }
+        $this->registerError($msg, $dberror, $dieOnError);
         return true;
-	}
-
-	/**
-	 * Register database error
-	 * If die-on-error flag is set, logs the message and dies,
-	 * otherwise sets last_error to the message
-	 * @param string $userMessage Message from function user
-	 * @param string $message Message from SQL driver
-	 * @param bool $dieOnError
-	 */
-	protected function registerError($userMessage, $message, $dieOnError = false)
-	{
-		if(!empty($message)) {
-			if(!empty($userMessage)) {
-				$message = "$userMessage: $message";
-			}
-			if(empty($message)) {
-			    $message = "Database error";
-			}
-			$this->log->fatal($message);
-			if ($dieOnError || $this->dieOnError) {
-				if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
-					sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
-				} else {
-					sugar_die("Database error. Please check suitecrm.log for details.");
-				}
-			} else {
-				$this->last_error = $message;
-			}
-		}
-	}
-
-	/**
-	 * Return DB error message for the last query executed
-	 * @return string Last error message
-	 */
-	public function lastError()
-	{
-		return $this->last_error;
-	}
-
-	/**
-	 * This method is called by every method that runs a query.
-	 * If slow query dumping is turned on and the query time is beyond
-	 * the time limit, we will log the query. This function may do
-	 * additional reporting or log in a different area in the future.
-	 *
-	 * @param  string  $query query to log
-	 * @return boolean true if the query was logged, false otherwise
-	 */
-	protected function dump_slow_queries($query)
-	{
-		global $sugar_config;
-
-		$do_the_dump = isset($sugar_config['dump_slow_queries'])
-			? $sugar_config['dump_slow_queries'] : false;
-		$slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
-			? $sugar_config['slow_query_time_msec'] : 5000;
-
-		if($do_the_dump) {
-			if($slow_query_time_msec < ($this->query_time * 1000)) {
-				// Then log both the query and the query time
-				$this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
-				return true;
-			}
-		}
-		return false;
-	}
+    }
+
+    /**
+     * Register database error
+     * If die-on-error flag is set, logs the message and dies,
+     * otherwise sets last_error to the message
+     * @param string $userMessage Message from function user
+     * @param string $message Message from SQL driver
+     * @param bool $dieOnError
+     */
+    protected function registerError($userMessage, $message, $dieOnError = false)
+    {
+        if(!empty($message)) {
+            if(!empty($userMessage)) {
+                $message = "$userMessage: $message";
+            }
+            if(empty($message)) {
+                $message = "Database error";
+            }
+            $this->log->fatal($message);
+            if ($dieOnError || $this->dieOnError) {
+                if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
+                    sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
+                } else {
+                    sugar_die("Database error. Please check suitecrm.log for details.");
+                }
+            } else {
+                $this->last_error = $message;
+            }
+        }
+    }
+
+    /**
+     * Return DB error message for the last query executed
+     * @return string Last error message
+     */
+    public function lastError()
+    {
+        return $this->last_error;
+    }
+
+    /**
+     * This method is called by every method that runs a query.
+     * If slow query dumping is turned on and the query time is beyond
+     * the time limit, we will log the query. This function may do
+     * additional reporting or log in a different area in the future.
+     *
+     * @param  string  $query query to log
+     * @return boolean true if the query was logged, false otherwise
+     */
+    protected function dump_slow_queries($query)
+    {
+        global $sugar_config;
+
+        $do_the_dump = isset($sugar_config['dump_slow_queries'])
+            ? $sugar_config['dump_slow_queries'] : false;
+        $slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
+            ? $sugar_config['slow_query_time_msec'] : 5000;
+
+        if($do_the_dump) {
+            if($slow_query_time_msec < ($this->query_time * 1000)) {
+                // Then log both the query and the query time
+                $this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
+                return true;
+            }
+        }
+        return false;
+    }
 
 /**
-	* Scans order by to ensure that any field being ordered by is.
-	*
-	* It will throw a warning error to the log file - fatal if slow query logging is enabled
-	*
-	* @param  string $sql         query to be run
-	* @param  bool   $object_name optional, object to look up indices in
-	* @return bool   true if an index is found false otherwise
-	*/
+ * Scans order by to ensure that any field being ordered by is.
+ *
+ * It will throw a warning error to the log file - fatal if slow query logging is enabled
+ *
+ * @param  string $sql         query to be run
+ * @param  bool   $object_name optional, object to look up indices in
+ * @return bool   true if an index is found false otherwise
+ */
 protected function checkQuery($sql, $object_name = false)
 {
-	$match = array();
-	preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
-	$indices = false;
-	if (!empty($match[1][0]))
-		$table = $match[1][0];
-	else
-		return false;
-
-	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
-		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
-
-	if (empty($indices)) {
-		foreach ( $GLOBALS['dictionary'] as $current ) {
-			if ($current['table'] == $table){
-				$indices = $current['indices'];
-				break;
-			}
-		}
-	}
-	if (empty($indices)) {
-		$this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
-		return false;
-	}
-	if (!empty($match[2][0])) {
-		$orderBys = explode(' ', $match[2][0]);
-		foreach ($orderBys as $orderBy){
-			$orderBy = trim($orderBy);
-			if (empty($orderBy))
-				continue;
-			$orderBy = strtolower($orderBy);
-			if ($orderBy == 'asc' || $orderBy == 'desc')
-				continue;
-
-			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
-
-			foreach ($indices as $index)
-				if (empty($index['db']) || $index['db'] == $this->dbType)
-					foreach ($index['fields'] as $field)
-						if ($field == $orderBy)
-							return true;
-
-			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
-			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
-			else
-				$this->log->warn('CHECK QUERY:' .$warning);
-		}
-	}
-	return false;
-	}
-
-	/**
-	 * Returns the time the last query took to execute
-	 *
-	 * @return int
-	 */
-	public function getQueryTime()
-	{
-		return $this->query_time;
-	}
-
-	/**
-	 * Checks the current connection; if it is not connected then reconnect
-	 */
-	public function checkConnection()
-	{
-		$this->last_error = '';
-		if (!isset($this->database))
-			$this->connect();
-	}
-
-	/**
-	 * Sets the dieOnError value
-	 *
-	 * @param bool $value
-	 */
-	public function setDieOnError($value)
-	{
-		$this->dieOnError = $value;
-	}
+    $match = array();
+    preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
+    $indices = false;
+    if (!empty($match[1][0]))
+        $table = $match[1][0];
+    else
+        return false;
+
+    if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
+        $indices = $GLOBALS['dictionary'][$object_name]['indices'];
+
+    if (empty($indices)) {
+        foreach ( $GLOBALS['dictionary'] as $current ) {
+            if ($current['table'] == $table){
+                $indices = $current['indices'];
+                break;
+            }
+        }
+    }
+    if (empty($indices)) {
+        $this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
+        return false;
+    }
+    if (!empty($match[2][0])) {
+        $orderBys = explode(' ', $match[2][0]);
+        foreach ($orderBys as $orderBy){
+            $orderBy = trim($orderBy);
+            if (empty($orderBy))
+                continue;
+            $orderBy = strtolower($orderBy);
+            if ($orderBy == 'asc' || $orderBy == 'desc')
+                continue;
+
+            $orderBy = str_replace(array($table . '.', ','), '', $orderBy);
+
+            foreach ($indices as $index)
+                if (empty($index['db']) || $index['db'] == $this->dbType)
+                    foreach ($index['fields'] as $field)
+                        if ($field == $orderBy)
+                            return true;
+
+            $warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
+            if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
+                $this->log->fatal('CHECK QUERY:' .$warning);
+            else
+                $this->log->warn('CHECK QUERY:' .$warning);
+        }
+    }
+    return false;
+    }
+
+    /**
+     * Returns the time the last query took to execute
+     *
+     * @return int
+     */
+    public function getQueryTime()
+    {
+        return $this->query_time;
+    }
+
+    /**
+     * Checks the current connection; if it is not connected then reconnect
+     */
+    public function checkConnection()
+    {
+        $this->last_error = '';
+        if (!isset($this->database))
+            $this->connect();
+    }
+
+    /**
+     * Sets the dieOnError value
+     *
+     * @param bool $value
+     */
+    public function setDieOnError($value)
+    {
+        $this->dieOnError = $value;
+    }
 
     /**
      * Implements a generic insert for any bean.
@@ -488,67 +488,67 @@ 
      * @return bool query result
      *
      */
-	public function insert(SugarBean $bean)
-	{
-		$sql = $this->insertSQL($bean);
-		$tablename =  $bean->getTableName();
-		$msg = "Error inserting into table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Insert data into table by parameter definition
-	 * @param string $table Table name
-	 * @param array $field_defs Definitions in vardef-like format
-	 * @param array $data Key/value to insert
-	 * @param array $field_map Fields map from SugarBean
-	 * @param bool $execute Execute or return query?
+    public function insert(SugarBean $bean)
+    {
+        $sql = $this->insertSQL($bean);
+        $tablename =  $bean->getTableName();
+        $msg = "Error inserting into table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Insert data into table by parameter definition
+     * @param string $table Table name
+     * @param array $field_defs Definitions in vardef-like format
+     * @param array $data Key/value to insert
+     * @param array $field_map Fields map from SugarBean
+     * @param bool $execute Execute or return query?
      * @return bool query result
      */
-	public function insertParams($table, $field_defs, $data, $field_map = null, $execute = true)
-	{
-		$values = array();
-		foreach ($field_defs as $field => $fieldDef)
-		{
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
-			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
-
-			if(isset($data[$field])) {
-				// clean the incoming value..
-				$val = from_html($data[$field]);
-			} else {
-				if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
-					$val = $fieldDef['default'];
-				} else {
-					$val = null;
-				}
-			}
-
-			//handle auto increment values here - we may have to do something like nextval for oracle
-			if (!empty($fieldDef['auto_increment'])) {
-				$auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
-				if(!empty($auto)) {
-					$values[$field] = $auto;
-				}
-			} elseif ($fieldDef['name'] == 'deleted') {
-				$values['deleted'] = (int)$val;
-			} else {
-				// need to do some thing about types of values
-				if(!is_null($val) || !empty($fieldDef['required'])) {
-					$values[$field] = $this->massageValue($val, $fieldDef);
-				}
-			}
-		}
-
-		if (empty($values))
-			return $execute?true:''; // no columns set
-
-		// get the entire sql
-		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
+    public function insertParams($table, $field_defs, $data, $field_map = null, $execute = true)
+    {
+        $values = array();
+        foreach ($field_defs as $field => $fieldDef)
+        {
+            if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+            //custom fields handle there save seperatley
+            if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+
+            if(isset($data[$field])) {
+                // clean the incoming value..
+                $val = from_html($data[$field]);
+            } else {
+                if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+                    $val = $fieldDef['default'];
+                } else {
+                    $val = null;
+                }
+            }
+
+            //handle auto increment values here - we may have to do something like nextval for oracle
+            if (!empty($fieldDef['auto_increment'])) {
+                $auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
+                if(!empty($auto)) {
+                    $values[$field] = $auto;
+                }
+            } elseif ($fieldDef['name'] == 'deleted') {
+                $values['deleted'] = (int)$val;
+            } else {
+                // need to do some thing about types of values
+                if(!is_null($val) || !empty($fieldDef['required'])) {
+                    $values[$field] = $this->massageValue($val, $fieldDef);
+                }
+            }
+        }
+
+        if (empty($values))
+            return $execute?true:''; // no columns set
+
+        // get the entire sql
+        $query = "INSERT INTO $table (".implode(",", array_keys($values)).")
 					VALUES (".implode(",", $values).")";
-		return $execute?$this->query($query):$query;
-	}
+        return $execute?$this->query($query):$query;
+    }
 
     /**
      * Implements a generic update for any bean
@@ -560,13 +560,13 @@ 
      * @return bool query result
      *
      */
-	public function update(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->updateSQL($bean, $where);
-		$tablename = $bean->getTableName();
-		$msg = "Error updating table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
+    public function update(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->updateSQL($bean, $where);
+        $tablename = $bean->getTableName();
+        $msg = "Error updating table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
 
     /**
      * Implements a generic delete for any bean identified by id
@@ -577,215 +577,215 @@ 
      * If where is not passed, it defaults to id of table
      * @return bool query result
      */
-	public function delete(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->deleteSQL($bean, $where);
-		$tableName = $bean->getTableName();
-		$msg = "Error deleting from table: ".$tableName. ":";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Implements a generic retrieve for any bean identified by id
-	 *
-	 * If we want to pass multiple values for a name, pass it as an array
-	 * If where is not passed, it defaults to id of table
-	 *
-	 * @param  SugarBean   $bean  Sugarbean instance
-	 * @param  array    $where values with the keys as names of fields.
-	 * @return resource result from the query
-	 */
-	public function retrieve(SugarBean $bean, array $where = array())
-	{
-		$sql = $this->retrieveSQL($bean, $where);
-		$tableName = $bean->getTableName();
-		$msg = "Error retriving values from table:".$tableName. ":";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Implements a generic retrieve for a collection of beans.
-	 *
-	 * These beans will be joined in the sql by the key attribute of field defs.
-	 * Currently, this function does support outer joins.
-	 *
-	 * @param  array $beans Sugarbean instance(s)
-	 * @param  array $cols  columns to be returned with the keys as names of bean as identified by
-	 * get_class of bean. Values of this array is the array of fieldDefs to be returned for a bean.
-	 * If an empty array is passed, all columns are selected.
-	 * @param  array $where  values with the keys as names of bean as identified by get_class of bean
-	 * Each value at the first level is an array of values for that bean identified by name of fields.
-	 * If we want to pass multiple values for a name, pass it as an array
-	 * If where is not passed, all the rows will be returned.
-	 * @return resource
-	 */
-	public function retrieveView(array $beans, array $cols = array(), array $where = array())
-	{
-		$sql = $this->retrieveViewSQL($beans, $cols, $where);
-		$msg = "Error retriving values from View Collection:";
-		return $this->query($sql,true,$msg);
-	}
-
-
-	/**
-	 * Implements creation of a db table for a bean.
-	 *
-	 * NOTE: does not handle out-of-table constraints, use createConstraintSQL for that
-	 * @param SugarBean $bean  Sugarbean instance
-	 */
-	public function createTable(SugarBean $bean)
-	{
-		$sql = $this->createTableSQL($bean);
-		$tablename = $bean->getTableName();
-		$msg = "Error creating table: $tablename:";
-		$this->query($sql,true,$msg);
-		if(!$this->supports("inline_keys")) {
-		// handle constraints and indices
-			$indicesArr = $this->createConstraintSql($bean);
-			if (count($indicesArr) > 0)
-				foreach ($indicesArr as $indexSql)
-					$this->query($indexSql, true, $msg);
-		}
-	}
-
-	/**
-	 * returns SQL to create constraints or indices
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @return array list of SQL statements
-	 */
-	protected function createConstraintSql(SugarBean $bean)
-	{
-		return $this->getConstraintSql($bean->getIndices(), $bean->getTableName());
-	}
-
-	/**
-	 * Implements creation of a db table
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs  Field definitions, in vardef format
-	 * @param array  $indices    Index definitions, in vardef format
-	 * @param string $engine    Engine parameter, used for MySQL engine so far
+    public function delete(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->deleteSQL($bean, $where);
+        $tableName = $bean->getTableName();
+        $msg = "Error deleting from table: ".$tableName. ":";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Implements a generic retrieve for any bean identified by id
+     *
+     * If we want to pass multiple values for a name, pass it as an array
+     * If where is not passed, it defaults to id of table
+     *
+     * @param  SugarBean   $bean  Sugarbean instance
+     * @param  array    $where values with the keys as names of fields.
+     * @return resource result from the query
+     */
+    public function retrieve(SugarBean $bean, array $where = array())
+    {
+        $sql = $this->retrieveSQL($bean, $where);
+        $tableName = $bean->getTableName();
+        $msg = "Error retriving values from table:".$tableName. ":";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Implements a generic retrieve for a collection of beans.
+     *
+     * These beans will be joined in the sql by the key attribute of field defs.
+     * Currently, this function does support outer joins.
+     *
+     * @param  array $beans Sugarbean instance(s)
+     * @param  array $cols  columns to be returned with the keys as names of bean as identified by
+     * get_class of bean. Values of this array is the array of fieldDefs to be returned for a bean.
+     * If an empty array is passed, all columns are selected.
+     * @param  array $where  values with the keys as names of bean as identified by get_class of bean
+     * Each value at the first level is an array of values for that bean identified by name of fields.
+     * If we want to pass multiple values for a name, pass it as an array
+     * If where is not passed, all the rows will be returned.
+     * @return resource
+     */
+    public function retrieveView(array $beans, array $cols = array(), array $where = array())
+    {
+        $sql = $this->retrieveViewSQL($beans, $cols, $where);
+        $msg = "Error retriving values from View Collection:";
+        return $this->query($sql,true,$msg);
+    }
+
+
+    /**
+     * Implements creation of a db table for a bean.
+     *
+     * NOTE: does not handle out-of-table constraints, use createConstraintSQL for that
+     * @param SugarBean $bean  Sugarbean instance
+     */
+    public function createTable(SugarBean $bean)
+    {
+        $sql = $this->createTableSQL($bean);
+        $tablename = $bean->getTableName();
+        $msg = "Error creating table: $tablename:";
+        $this->query($sql,true,$msg);
+        if(!$this->supports("inline_keys")) {
+        // handle constraints and indices
+            $indicesArr = $this->createConstraintSql($bean);
+            if (count($indicesArr) > 0)
+                foreach ($indicesArr as $indexSql)
+                    $this->query($indexSql, true, $msg);
+        }
+    }
+
+    /**
+     * returns SQL to create constraints or indices
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @return array list of SQL statements
+     */
+    protected function createConstraintSql(SugarBean $bean)
+    {
+        return $this->getConstraintSql($bean->getIndices(), $bean->getTableName());
+    }
+
+    /**
+     * Implements creation of a db table
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs  Field definitions, in vardef format
+     * @param array  $indices    Index definitions, in vardef format
+     * @param string $engine    Engine parameter, used for MySQL engine so far
      * @todo: refactor engine param to be more generic
      * @return bool success value
      */
-	public function createTableParams($tablename, $fieldDefs, $indices, $engine = null)
-	{
-		if (!empty($fieldDefs)) {
-			$sql = $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
-			$res = true;
-			if ($sql) {
-				$msg = "Error creating table: $tablename";
-				$res = ($res and $this->query($sql,true,$msg));
-			}
-			if(!$this->supports("inline_keys")) {
-				// handle constraints and indices
-				$indicesArr = $this->getConstraintSql($indices, $tablename);
-				if (count($indicesArr) > 0)
-					foreach ($indicesArr as $indexSql)
-						$res = ($res and $this->query($indexSql, true, "Error creating indexes"));
-			}
-			return $res;
-		}
-		return false;
-	}
-
-	/**
-	 * Implements repair of a db table for a bean.
-	 *
-	 * @param  SugarBean $bean    SugarBean instance
-	 * @param  bool   $execute true if we want the action to take place, false if we just want the sql returned
-	 * @return string SQL statement or empty string, depending upon $execute
-	 */
-	public function repairTable(SugarBean $bean, $execute = true)
-	{
-		$indices   = $bean->getIndices();
-		$fielddefs = $bean->getFieldDefinitions();
-		$tablename = $bean->getTableName();
-
-		//Clean the indexes to prevent duplicate definitions
-		$new_index = array();
-		foreach($indices as $ind_def){
-			$new_index[$ind_def['name']] = $ind_def;
-		}
-		//jc: added this for beans that do not actually have a table, namely
-		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
-			return '';
-
-		global $dictionary;
-		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
-
-		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
-	}
-
-	/**
-	 * Can this field be null?
-	 * Auto-increment and ID fields can not be null
-	 * @param array $vardef
+    public function createTableParams($tablename, $fieldDefs, $indices, $engine = null)
+    {
+        if (!empty($fieldDefs)) {
+            $sql = $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
+            $res = true;
+            if ($sql) {
+                $msg = "Error creating table: $tablename";
+                $res = ($res and $this->query($sql,true,$msg));
+            }
+            if(!$this->supports("inline_keys")) {
+                // handle constraints and indices
+                $indicesArr = $this->getConstraintSql($indices, $tablename);
+                if (count($indicesArr) > 0)
+                    foreach ($indicesArr as $indexSql)
+                        $res = ($res and $this->query($indexSql, true, "Error creating indexes"));
+            }
+            return $res;
+        }
+        return false;
+    }
+
+    /**
+     * Implements repair of a db table for a bean.
+     *
+     * @param  SugarBean $bean    SugarBean instance
+     * @param  bool   $execute true if we want the action to take place, false if we just want the sql returned
+     * @return string SQL statement or empty string, depending upon $execute
+     */
+    public function repairTable(SugarBean $bean, $execute = true)
+    {
+        $indices   = $bean->getIndices();
+        $fielddefs = $bean->getFieldDefinitions();
+        $tablename = $bean->getTableName();
+
+        //Clean the indexes to prevent duplicate definitions
+        $new_index = array();
+        foreach($indices as $ind_def){
+            $new_index[$ind_def['name']] = $ind_def;
+        }
+        //jc: added this for beans that do not actually have a table, namely
+        //ForecastOpportunities
+        if($tablename == 'does_not_exist' || $tablename == '')
+            return '';
+
+        global $dictionary;
+        $engine=null;
+        if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
+            $engine = $dictionary[$bean->getObjectName()]['engine'];
+
+        return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
+    }
+
+    /**
+     * Can this field be null?
+     * Auto-increment and ID fields can not be null
+     * @param array $vardef
      * @return bool
      */
-	protected function isNullable($vardef)
-	{
-
-		if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
-			&& !empty($vardef['required'])) {
-				/* required + is_null=false => not null */
-			return false;
-		}
-		if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
-					&& (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
-					&& (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
-		) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * Builds the SQL commands that repair a table structure
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fielddefs Field definitions, in vardef format
-	 * @param  array  $indices   Index definitions, in vardef format
-	 * @param  bool   $execute   optional, true if we want the queries executed instead of returned
-	 * @param  string $engine    optional, MySQL engine
+    protected function isNullable($vardef)
+    {
+
+        if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
+            && !empty($vardef['required'])) {
+                /* required + is_null=false => not null */
+            return false;
+        }
+        if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
+                    && (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
+                    && (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Builds the SQL commands that repair a table structure
+     *
+     * @param  string $tablename
+     * @param  array  $fielddefs Field definitions, in vardef format
+     * @param  array  $indices   Index definitions, in vardef format
+     * @param  bool   $execute   optional, true if we want the queries executed instead of returned
+     * @param  string $engine    optional, MySQL engine
      * @todo: refactor engine param to be more generic
      * @return string
      */
-	public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
-	{
-		//jc: had a bug when running the repair if the tablename is blank the repair will
-		//fail when it tries to create a repair table
-		if ($tablename == '' || empty($fielddefs))
-			return '';
-
-		//if the table does not exist create it and we are done
-		$sql = "/* Table : $tablename */\n";
-		if (!$this->tableExists($tablename)) {
-			$createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
-			if($execute && $createtablesql){
-				$this->createTableParams($tablename,$fielddefs,$indices,$engine);
-			}
-
-			$sql .= "/* MISSING TABLE: {$tablename} */\n";
-			$sql .= $createtablesql . "\n";
-			return $sql;
-		}
-
-		$compareFieldDefs = $this->get_columns($tablename);
-		$compareIndices = $this->get_indices($tablename);
-
-		$take_action = false;
-
-		// do column comparisons
-		$sql .=	"/*COLUMNS*/\n";
-		foreach ($fielddefs as $name => $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+    public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
+    {
+        //jc: had a bug when running the repair if the tablename is blank the repair will
+        //fail when it tries to create a repair table
+        if ($tablename == '' || empty($fielddefs))
+            return '';
+
+        //if the table does not exist create it and we are done
+        $sql = "/* Table : $tablename */\n";
+        if (!$this->tableExists($tablename)) {
+            $createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
+            if($execute && $createtablesql){
+                $this->createTableParams($tablename,$fielddefs,$indices,$engine);
+            }
+
+            $sql .= "/* MISSING TABLE: {$tablename} */\n";
+            $sql .= $createtablesql . "\n";
+            return $sql;
+        }
+
+        $compareFieldDefs = $this->get_columns($tablename);
+        $compareIndices = $this->get_indices($tablename);
+
+        $take_action = false;
+
+        // do column comparisons
+        $sql .=	"/*COLUMNS*/\n";
+        foreach ($fielddefs as $name => $value) {
+            if (isset($value['source']) && $value['source'] != 'db')
+                continue;
 
             // Bug #42406. Skipping breaked vardef without type or name
             if (isset($value['name']) == false || $value['name'] == false)
@@ -799,183 +799,183 @@ 
                 continue;
             }
 
-			$name = strtolower($value['name']);
-			// add or fix the field defs per what the DB is expected to give us back
-			$this->massageFieldDef($value,$tablename);
-
-			$ignorerequired=false;
-
-			//Do not track requiredness in the DB, auto_increment, ID,
-			// and deleted fields are always required in the DB, so don't force those
-			if ($this->isNullable($value)) {
-				$value['required'] = false;
-			}
-			//Should match the conditions in DBManager::oneColumnSQLRep for DB required fields, type='id' fields will sometimes
-
-			//come into this function as 'type' = 'char', 'dbType' = 'id' without required set in $value. Assume they are correct and leave them alone.
-			else if (($name == 'id' || $value['type'] == 'id' || (isset($value['dbType']) && $value['dbType'] == 'id'))
-				&& (!isset($value['required']) && isset($compareFieldDefs[$name]['required'])))
-			{
-				$value['required'] = $compareFieldDefs[$name]['required'];
-			}
-
-			if ( !isset($compareFieldDefs[$name]) ) {
-				// ok we need this field lets create it
-				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
-				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
-				if ($execute)
-					$this->addColumn($tablename, $value);
-				$take_action = true;
-			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
-				//fields are different lets alter it
-				$sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach($compareFieldDefs[$name] as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
-				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach($value as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
-				}
-				$sql .=	"*/\n";
-
-				//jc: oracle will complain if you try to execute a statement that sets a column to (not) null
-				//when it is already (not) null
-				if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
-					$value['isnull'] === $compareFieldDefs[$name]['isnull']) {
-					unset($value['required']);
-					$ignorerequired=true;
-				}
-
-				//dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
-				if ((isset($value['required']) && ($value['required'] === true || $value['required'] == 'true' || $value['required'] === 1))
-					&& (empty($compareFieldDefs[$name]['required']) || $compareFieldDefs[$name]['required'] != 'true'))
-				{
-					$ignorerequired = true;
-				}
-				$altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
-				if(is_array($altersql)) {
-					$altersql = join("\n", $altersql);
-				}
-				$sql .= $altersql .  "\n";
-				if($execute){
-					$this->alterColumn($tablename, $value, $ignorerequired);
-				}
-				$take_action = true;
-			}
-		}
-
-		// do index comparisons
-		$sql .=	"/* INDEXES */\n";
-		$correctedIndexs = array();
+            $name = strtolower($value['name']);
+            // add or fix the field defs per what the DB is expected to give us back
+            $this->massageFieldDef($value,$tablename);
 
-        $compareIndices_case_insensitive = array();
+            $ignorerequired=false;
 
-		// do indices comparisons case-insensitive
-		foreach($compareIndices as $k => $value){
-			$value['name'] = strtolower($value['name']);
-			$compareIndices_case_insensitive[strtolower($k)] = $value;
-		}
-		$compareIndices = $compareIndices_case_insensitive;
-		unset($compareIndices_case_insensitive);
-
-		foreach ($indices as $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
-
-
-			$validDBName = $this->getValidDBName($value['name'], true, 'index', true);
-			if (isset($compareIndices[$validDBName])) {
-				$value['name'] = $validDBName;
-			}
-		    $name = strtolower($value['name']);
-
-			//Don't attempt to fix the same index twice in one pass;
-			if (isset($correctedIndexs[$name]))
-				continue;
-
-			//don't bother checking primary nothing we can do about them
-			if (isset($value['type']) && $value['type'] == 'primary')
-				continue;
-
-			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
-				continue;
-
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
-				$value['type'] = 'index';
-
-			if ( !isset($compareIndices[$name]) ) {
-				//First check if an index exists that doesn't match our name, if so, try to rename it
-				$found = false;
-				foreach ($compareIndices as $ex_name => $ex_value) {
-					if($this->compareVarDefs($ex_value, $value, true)) {
-						$found = $ex_name;
-						break;
-					}
-				}
-				if ($found) {
-					$sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
-					$rename = $this->renameIndexDefs($ex_value, $value, $tablename);
-					if($execute) {
-						$this->query($rename, true, "Cannot rename index");
-					}
-					$sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
-
-				} else {
-					// ok we need this field lets create it
-					$sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
-					$sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
-				}
-				$take_action = true;
-				$correctedIndexs[$name] = true;
-			} elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
-				// fields are different lets alter it
-				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach ($compareIndices[$name] as $n1 => $t1) {
-					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
-							$sql .= "[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
-				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach ($value as $n1 => $t1) {
-					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
-						foreach ($t1 as $rKey => $rValue)
-							$sql .=	"[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
-				}
-				$sql .=	"*/\n";
-				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
-				$take_action = true;
-				$correctedIndexs[$name] = true;
-			}
-		}
-
-		return ($take_action === true) ? $sql : '';
-	}
+            //Do not track requiredness in the DB, auto_increment, ID,
+            // and deleted fields are always required in the DB, so don't force those
+            if ($this->isNullable($value)) {
+                $value['required'] = false;
+            }
+            //Should match the conditions in DBManager::oneColumnSQLRep for DB required fields, type='id' fields will sometimes
 
-    /**
-     * Compares two vardefs
-     *
-     * @param  array  $fielddef1 This is from the database
-     * @param  array  $fielddef2 This is from the vardef
-     * @param bool $ignoreName Ignore name-only differences?
-     * @return bool   true if they match, false if they don't
-     */
-	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
-	{
-		foreach ( $fielddef1 as $key => $value ) {
-			if ($key == 'name' && $ignoreName)
-				continue;
-            if (isset($fielddef2[$key]))
+            //come into this function as 'type' = 'char', 'dbType' = 'id' without required set in $value. Assume they are correct and leave them alone.
+            else if (($name == 'id' || $value['type'] == 'id' || (isset($value['dbType']) && $value['dbType'] == 'id'))
+                && (!isset($value['required']) && isset($compareFieldDefs[$name]['required'])))
             {
-                if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
+                $value['required'] = $compareFieldDefs[$name]['required'];
+            }
+
+            if ( !isset($compareFieldDefs[$name]) ) {
+                // ok we need this field lets create it
+                $sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
+                $sql .= $this->addColumnSQL($tablename, $value) .  "\n";
+                if ($execute)
+                    $this->addColumn($tablename, $value);
+                $take_action = true;
+            } elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
+                //fields are different lets alter it
+                $sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
+                foreach($compareFieldDefs[$name] as $rKey => $rValue) {
+                    $sql .=	"[$rKey] => '$rValue'  ";
+                }
+                $sql .=	"*/\n";
+                $sql .=	"/* VARDEF - $name -  ROW";
+                foreach($value as $rKey => $rValue) {
+                    $sql .=	"[$rKey] => '$rValue'  ";
+                }
+                $sql .=	"*/\n";
+
+                //jc: oracle will complain if you try to execute a statement that sets a column to (not) null
+                //when it is already (not) null
+                if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
+                    $value['isnull'] === $compareFieldDefs[$name]['isnull']) {
+                    unset($value['required']);
+                    $ignorerequired=true;
+                }
+
+                //dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
+                if ((isset($value['required']) && ($value['required'] === true || $value['required'] == 'true' || $value['required'] === 1))
+                    && (empty($compareFieldDefs[$name]['required']) || $compareFieldDefs[$name]['required'] != 'true'))
+                {
+                    $ignorerequired = true;
+                }
+                $altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
+                if(is_array($altersql)) {
+                    $altersql = join("\n", $altersql);
+                }
+                $sql .= $altersql .  "\n";
+                if($execute){
+                    $this->alterColumn($tablename, $value, $ignorerequired);
+                }
+                $take_action = true;
+            }
+        }
+
+        // do index comparisons
+        $sql .=	"/* INDEXES */\n";
+        $correctedIndexs = array();
+
+        $compareIndices_case_insensitive = array();
+
+        // do indices comparisons case-insensitive
+        foreach($compareIndices as $k => $value){
+            $value['name'] = strtolower($value['name']);
+            $compareIndices_case_insensitive[strtolower($k)] = $value;
+        }
+        $compareIndices = $compareIndices_case_insensitive;
+        unset($compareIndices_case_insensitive);
+
+        foreach ($indices as $value) {
+            if (isset($value['source']) && $value['source'] != 'db')
+                continue;
+
+
+            $validDBName = $this->getValidDBName($value['name'], true, 'index', true);
+            if (isset($compareIndices[$validDBName])) {
+                $value['name'] = $validDBName;
+            }
+            $name = strtolower($value['name']);
+
+            //Don't attempt to fix the same index twice in one pass;
+            if (isset($correctedIndexs[$name]))
+                continue;
+
+            //don't bother checking primary nothing we can do about them
+            if (isset($value['type']) && $value['type'] == 'primary')
+                continue;
+
+            //database helpers do not know how to handle full text indices
+            if ($value['type']=='fulltext')
+                continue;
+
+            if ( in_array($value['type'],array('alternate_key','foreign')) )
+                $value['type'] = 'index';
+
+            if ( !isset($compareIndices[$name]) ) {
+                //First check if an index exists that doesn't match our name, if so, try to rename it
+                $found = false;
+                foreach ($compareIndices as $ex_name => $ex_value) {
+                    if($this->compareVarDefs($ex_value, $value, true)) {
+                        $found = $ex_name;
+                        break;
+                    }
+                }
+                if ($found) {
+                    $sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
+                    $rename = $this->renameIndexDefs($ex_value, $value, $tablename);
+                    if($execute) {
+                        $this->query($rename, true, "Cannot rename index");
+                    }
+                    $sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
+
+                } else {
+                    // ok we need this field lets create it
+                    $sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
+                    $sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
+                }
+                $take_action = true;
+                $correctedIndexs[$name] = true;
+            } elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
+                // fields are different lets alter it
+                $sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
+                foreach ($compareIndices[$name] as $n1 => $t1) {
+                    $sql .=	 "<$n1>";
+                    if ( $n1 == 'fields' )
+                        foreach($t1 as $rKey => $rValue)
+                            $sql .= "[$rKey] => '$rValue'  ";
+                    else
+                        $sql .= " $t1 ";
+                }
+                $sql .=	"*/\n";
+                $sql .=	"/* VARDEF - $name -  ROW";
+                foreach ($value as $n1 => $t1) {
+                    $sql .=	"<$n1>";
+                    if ( $n1 == 'fields' )
+                        foreach ($t1 as $rKey => $rValue)
+                            $sql .=	"[$rKey] => '$rValue'  ";
+                    else
+                        $sql .= " $t1 ";
+                }
+                $sql .=	"*/\n";
+                $sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
+                $take_action = true;
+                $correctedIndexs[$name] = true;
+            }
+        }
+
+        return ($take_action === true) ? $sql : '';
+    }
+
+    /**
+     * Compares two vardefs
+     *
+     * @param  array  $fielddef1 This is from the database
+     * @param  array  $fielddef2 This is from the vardef
+     * @param bool $ignoreName Ignore name-only differences?
+     * @return bool   true if they match, false if they don't
+     */
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
+    {
+        foreach ( $fielddef1 as $key => $value ) {
+            if ($key == 'name' && $ignoreName)
+                continue;
+            if (isset($fielddef2[$key]))
+            {
+                if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
                 {
                     if (strtolower($fielddef1[$key]) == strtolower($fielddef2[$key]))
                     {
@@ -990,64 +990,64 @@ 
                     }
                 }
             }
-			//Ignore len if its not set in the vardef
-			if ($key == 'len' && empty($fielddef2[$key]))
-				continue;
+            //Ignore len if its not set in the vardef
+            if ($key == 'len' && empty($fielddef2[$key]))
+                continue;
             // if the length in db is greather than the vardef, ignore it
             if ($key == 'len' && ($fielddef1[$key] >= $fielddef2[$key])) {
                 continue;
             }
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Compare a field in two tables
-	 * @deprecated
-	 * @param  string $name   field name
-	 * @param  string $table1
-	 * @param  string $table2
-	 * @return array  array with keys 'msg','table1','table2'
-	 */
-	public function compareFieldInTables($name, $table1, $table2)
-	{
-		$row1 = $this->describeField($name, $table1);
-		$row2 = $this->describeField($name, $table2);
-		$returnArray = array(
-			'table1' => $row1,
-			'table2' => $row2,
-			'msg'    => 'error',
-			);
-
-		$ignore_filter = array('Key'=>1);
-		if ($row1) {
-			if (!$row2) {
-				// Exists on table1 but not table2
-				$returnArray['msg'] = 'not_exists_table2';
-			}
-			else {
-				if (sizeof($row1) != sizeof($row2)) {
-					$returnArray['msg'] = 'no_match';
-				}
-				else {
-					$returnArray['msg'] = 'match';
-					foreach($row1 as $key => $value){
-						//ignore keys when checking we will check them when we do the index check
-						if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
-							$returnArray['msg'] = 'no_match';
-						}
-					}
-				}
-			}
-		}
-		else {
-			$returnArray['msg'] = 'not_exists_table1';
-		}
-
-		return $returnArray;
-	}
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Compare a field in two tables
+     * @deprecated
+     * @param  string $name   field name
+     * @param  string $table1
+     * @param  string $table2
+     * @return array  array with keys 'msg','table1','table2'
+     */
+    public function compareFieldInTables($name, $table1, $table2)
+    {
+        $row1 = $this->describeField($name, $table1);
+        $row2 = $this->describeField($name, $table2);
+        $returnArray = array(
+            'table1' => $row1,
+            'table2' => $row2,
+            'msg'    => 'error',
+            );
+
+        $ignore_filter = array('Key'=>1);
+        if ($row1) {
+            if (!$row2) {
+                // Exists on table1 but not table2
+                $returnArray['msg'] = 'not_exists_table2';
+            }
+            else {
+                if (sizeof($row1) != sizeof($row2)) {
+                    $returnArray['msg'] = 'no_match';
+                }
+                else {
+                    $returnArray['msg'] = 'match';
+                    foreach($row1 as $key => $value){
+                        //ignore keys when checking we will check them when we do the index check
+                        if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
+                            $returnArray['msg'] = 'no_match';
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            $returnArray['msg'] = 'not_exists_table1';
+        }
+
+        return $returnArray;
+    }
 //
 //    /**
 //     * Compare an index in two different tables
@@ -1097,193 +1097,193 @@ 
 //    }
 
 
-	/**
-	 * Creates an index identified by name on the given fields.
-	 *
-	 * @param SugarBean $bean      SugarBean instance
-	 * @param array  $fieldDefs Field definitions, in vardef format
-	 * @param string $name      index name
-	 * @param bool   $unique    optional, true if we want to create an unique index
+    /**
+     * Creates an index identified by name on the given fields.
+     *
+     * @param SugarBean $bean      SugarBean instance
+     * @param array  $fieldDefs Field definitions, in vardef format
+     * @param string $name      index name
+     * @param bool   $unique    optional, true if we want to create an unique index
      * @return bool query result
      */
-	public function createIndex(SugarBean $bean, $fieldDefs, $name, $unique = true)
-	{
-		$sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
-		$tablename = $bean->getTableName();
-		$msg = "Error creating index $name on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * returns a SQL query that creates the indices as defined in metadata
-	 * @param  array  $indices Assoc array with index definitions from vardefs
-	 * @param  string $table Focus table
-	 * @return array  Array of SQL queries to generate indices
-	 */
-	public function getConstraintSql($indices, $table)
-	{
-		if (!$this->isFieldArray($indices))
-			$indices = array($indices);
-
-		$columns = array();
-
-		foreach ($indices as $index) {
-			if(!empty($index['db']) && $index['db'] != $this->dbType)
-				continue;
-			if (isset($index['source']) && $index['source'] != 'db')
-			continue;
-
-			$sql = $this->add_drop_constraint($table, $index);
-
-			if(!empty($sql)) {
-				$columns[] = $sql;
-			}
-		}
-
-		return $columns;
-	}
-
-	/**
-	 * Adds a new indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to add
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function addIndexes($tablename, $indexes, $execute = true)
-	{
-		$alters = $this->getConstraintSql($indexes, $tablename);
-		if ($execute) {
-			foreach($alters as $sql) {
-				$this->query($sql, true, "Error adding index: ");
-			}
-		}
-		if(!empty($alters)) {
-			$sql = join(";\n", $alters).";\n";
-		} else {
-			$sql = '';
-		}
-		return $sql;
-	}
-
-	/**
-	 * Drops indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to drop
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function dropIndexes($tablename, $indexes, $execute = true)
-	{
-		$sqls = array();
-		foreach ($indexes as $index) {
-			$name =$index['name'];
-			$sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
-		}
-		if (!empty($sqls) && $execute) {
-			foreach($sqls as $name => $sql) {
-				unset(self::$index_descriptions[$tablename][$name]);
-				$this->query($sql);
-			}
-		}
-		if(!empty($sqls)) {
-			return join(";\n",$sqls).";";
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Modifies indexes
-	 *
-	 * @param  string $tablename
-	 * @param  array  $indexes   indexes to modify
-	 * @param  bool   $execute   true if we want to execute the returned sql statement
-	 * @return string SQL statement
-	 */
-	public function modifyIndexes($tablename, $indexes, $execute = true)
-	{
-		return $this->dropIndexes($tablename, $indexes, $execute)."\n".
-			$this->addIndexes($tablename, $indexes, $execute);
-	}
-
-	/**
-	 * Adds a column to table identified by field def.
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs
+    public function createIndex(SugarBean $bean, $fieldDefs, $name, $unique = true)
+    {
+        $sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
+        $tablename = $bean->getTableName();
+        $msg = "Error creating index $name on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * returns a SQL query that creates the indices as defined in metadata
+     * @param  array  $indices Assoc array with index definitions from vardefs
+     * @param  string $table Focus table
+     * @return array  Array of SQL queries to generate indices
+     */
+    public function getConstraintSql($indices, $table)
+    {
+        if (!$this->isFieldArray($indices))
+            $indices = array($indices);
+
+        $columns = array();
+
+        foreach ($indices as $index) {
+            if(!empty($index['db']) && $index['db'] != $this->dbType)
+                continue;
+            if (isset($index['source']) && $index['source'] != 'db')
+            continue;
+
+            $sql = $this->add_drop_constraint($table, $index);
+
+            if(!empty($sql)) {
+                $columns[] = $sql;
+            }
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Adds a new indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to add
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function addIndexes($tablename, $indexes, $execute = true)
+    {
+        $alters = $this->getConstraintSql($indexes, $tablename);
+        if ($execute) {
+            foreach($alters as $sql) {
+                $this->query($sql, true, "Error adding index: ");
+            }
+        }
+        if(!empty($alters)) {
+            $sql = join(";\n", $alters).";\n";
+        } else {
+            $sql = '';
+        }
+        return $sql;
+    }
+
+    /**
+     * Drops indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to drop
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function dropIndexes($tablename, $indexes, $execute = true)
+    {
+        $sqls = array();
+        foreach ($indexes as $index) {
+            $name =$index['name'];
+            $sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
+        }
+        if (!empty($sqls) && $execute) {
+            foreach($sqls as $name => $sql) {
+                unset(self::$index_descriptions[$tablename][$name]);
+                $this->query($sql);
+            }
+        }
+        if(!empty($sqls)) {
+            return join(";\n",$sqls).";";
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Modifies indexes
+     *
+     * @param  string $tablename
+     * @param  array  $indexes   indexes to modify
+     * @param  bool   $execute   true if we want to execute the returned sql statement
+     * @return string SQL statement
+     */
+    public function modifyIndexes($tablename, $indexes, $execute = true)
+    {
+        return $this->dropIndexes($tablename, $indexes, $execute)."\n".
+            $this->addIndexes($tablename, $indexes, $execute);
+    }
+
+    /**
+     * Adds a column to table identified by field def.
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs
      * @return bool query result
      */
-	public function addColumn($tablename, $fieldDefs)
-	{
-		$sql = $this->addColumnSQL($tablename, $fieldDefs);
-		if ($this->isFieldArray($fieldDefs)){
-			$columns = array();
-			foreach ($fieldDefs as $fieldDef)
-				$columns[] = $fieldDef['name'];
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $fieldDefs['name'];
-		}
-		$msg = "Error adding column(s) $columns on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
-
-	/**
-	 * Alters old column identified by oldFieldDef to new fieldDef.
-	 *
-	 * @param string $tablename
-	 * @param array  $newFieldDef
-	 * @param bool   $ignoreRequired optional, true if we are ignoring this being a required field
+    public function addColumn($tablename, $fieldDefs)
+    {
+        $sql = $this->addColumnSQL($tablename, $fieldDefs);
+        if ($this->isFieldArray($fieldDefs)){
+            $columns = array();
+            foreach ($fieldDefs as $fieldDef)
+                $columns[] = $fieldDef['name'];
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $fieldDefs['name'];
+        }
+        $msg = "Error adding column(s) $columns on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
+
+    /**
+     * Alters old column identified by oldFieldDef to new fieldDef.
+     *
+     * @param string $tablename
+     * @param array  $newFieldDef
+     * @param bool   $ignoreRequired optional, true if we are ignoring this being a required field
      * @return bool query result
      */
-	public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
-	{
-		$sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
-		if ($this->isFieldArray($newFieldDef)){
-			$columns = array();
-			foreach ($newFieldDef as $fieldDef) {
-				$columns[] = $fieldDef['name'];
-			}
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $newFieldDef['name'];
-		}
-
-		$msg = "Error altering column(s) $columns on table: $tablename:";
-		$res = $this->query($sql,true,$msg);
-		if($res) {
-			$this->getTableDescription($tablename, true); // reload table description after altering
-		}
-		return $res;
-	}
-
-	/**
-	 * Drops the table associated with a bean
-	 *
-	 * @param SugarBean $bean SugarBean instance
+    public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
+    {
+        $sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
+        if ($this->isFieldArray($newFieldDef)){
+            $columns = array();
+            foreach ($newFieldDef as $fieldDef) {
+                $columns[] = $fieldDef['name'];
+            }
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $newFieldDef['name'];
+        }
+
+        $msg = "Error altering column(s) $columns on table: $tablename:";
+        $res = $this->query($sql,true,$msg);
+        if($res) {
+            $this->getTableDescription($tablename, true); // reload table description after altering
+        }
+        return $res;
+    }
+
+    /**
+     * Drops the table associated with a bean
+     *
+     * @param SugarBean $bean SugarBean instance
      * @return bool query result
-	 */
-	public function dropTable(SugarBean $bean)
-	{
-		return $this->dropTableName($bean->getTableName());
-	}
-
-	/**
-	 * Drops the table by name
-	 *
-	 * @param string $name Table name
+     */
+    public function dropTable(SugarBean $bean)
+    {
+        return $this->dropTableName($bean->getTableName());
+    }
+
+    /**
+     * Drops the table by name
+     *
+     * @param string $name Table name
      * @return bool query result
-	 */
-	public function dropTableName($name)
-	{
-		$sql = $this->dropTableNameSQL($name);
-		return $this->query($sql,true,"Error dropping table $name:");
-	}
+     */
+    public function dropTableName($name)
+    {
+        $sql = $this->dropTableNameSQL($name);
+        return $this->query($sql,true,"Error dropping table $name:");
+    }
 
     /**
      * Deletes a column identified by fieldDef.
@@ -1292,13 +1292,13 @@ 
      * @param array  $fieldDefs Vardef definition of the field
      * @return bool query result
      */
-	public function deleteColumn(SugarBean $bean, $fieldDefs)
-	{
-		$tablename = $bean->getTableName();
-		$sql = $this->dropColumnSQL($tablename, $fieldDefs);
-		$msg = "Error deleting column(s) on table: $tablename:";
-		return $this->query($sql,true,$msg);
-	}
+    public function deleteColumn(SugarBean $bean, $fieldDefs)
+    {
+        $tablename = $bean->getTableName();
+        $sql = $this->dropColumnSQL($tablename, $fieldDefs);
+        $msg = "Error deleting column(s) on table: $tablename:";
+        return $this->query($sql,true,$msg);
+    }
 
     /**
      * Generate a set of Insert statements based on the bean given
@@ -1313,228 +1313,228 @@ 
      * @param bool $is_related_query
      * @return string SQL insert statement
      */
-	public function generateInsertSQL(SugarBean $bean, $select_query, $start, $count = -1, $table, $is_related_query = false)
-	{
-		$this->log->info('call to DBManager::generateInsertSQL() is deprecated');
-		global $sugar_config;
-
-		$rows_found = 0;
-		$count_query = $bean->create_list_count_query($select_query);
-		if(!empty($count_query))
-		{
-			// We have a count query.  Run it and get the results.
-			$result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
-			$assoc = $this->fetchByAssoc($result);
-			if(!empty($assoc['c']))
-			{
-				$rows_found = $assoc['c'];
-			}
-		}
-		if($count == -1){
-			$count 	= $sugar_config['list_max_entries_per_page'];
-		}
-		$next_offset = $start + $count;
-
-		$result = $this->limitQuery($select_query, $start, $count);
-		// get basic insert
-		$sql = "INSERT INTO ".$table;
-		$custom_sql = "INSERT INTO ".$table."_cstm";
-
-		// get field definitions
-		$fields = $bean->getFieldDefinitions();
-		$custom_fields = array();
-
-		if($bean->hasCustomFields()){
-			foreach ($fields as $fieldDef){
-				if($fieldDef['source'] == 'custom_fields'){
-					$custom_fields[$fieldDef['name']] = $fieldDef['name'];
-				}
-			}
-			if(!empty($custom_fields)){
-				$custom_fields['id_c'] = 'id_c';
-				$id_field = array('name' => 'id_c', 'custom_type' => 'id',);
-				$fields[] = $id_field;
-			}
-		}
-
-		// get column names and values
-		$row_array = array();
-		$columns = array();
-		$cstm_row_array = array();
-		$cstm_columns = array();
-		$built_columns = false;
-		while(($row = $this->fetchByAssoc($result)) != null)
-		{
-			$values = array();
-			$cstm_values = array();
-			if(!$is_related_query){
-				foreach ($fields as $fieldDef)
-				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
-					$val = $row[$fieldDef['name']];
-
-					//handle auto increment values here only need to do this on insert not create
-					if ($fieldDef['name'] == 'deleted'){
-							$values['deleted'] = $val;
-							if(!$built_columns){
-							$columns[] = 'deleted';
-						}
-					}
-					else
-					{
-						$type = $fieldDef['type'];
-						if(!empty($fieldDef['custom_type'])){
-							$type = $fieldDef['custom_type'];
-						}
-						// need to do some thing about types of values
-						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_values[$fieldDef['name']] = 'null';
-							else
-								$values[$fieldDef['name']] = 'null';
-						}else{
-							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-								else
-									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-								else
-									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-							}
-						}
-						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_columns[] = $fieldDef['name'];
-							else
-								$columns[] = $fieldDef['name'];
-						}
-					}
-
-				}
-			} else {
-			foreach ($row as $key=>$val)
-			{
-					if($key != 'orc_row'){
-						$values[$key] = "'$val'";
-						if(!$built_columns){
-							$columns[] = $key;
-						}
-					}
-			}
-			}
-			$built_columns = true;
-			if(!empty($values)){
-				$row_array[] = $values;
-			}
-			if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
-				$cstm_row_array[] = $cstm_values;
-			}
-		}
-
-		//if (sizeof ($values) == 0) return ""; // no columns set
-
-		// get the entire sql
-		$sql .= "(".implode(",", $columns).") ";
-		$sql .= "VALUES";
-		for($i = 0; $i < count($row_array); $i++){
-			$sql .= " (".implode(",", $row_array[$i]).")";
-			if($i < (count($row_array) - 1)){
-				$sql .= ", ";
-			}
-		}
-		//custom
-		// get the entire sql
-		$custom_sql .= "(".implode(",", $cstm_columns).") ";
-		$custom_sql .= "VALUES";
-
-		for($i = 0; $i < count($cstm_row_array); $i++){
-			$custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
-			if($i < (count($cstm_row_array) - 1)){
-				$custom_sql .= ", ";
-			}
-		}
-		return array('data' => $sql, 'cstm_sql' => $custom_sql, /*'result_count' => $row_count, */ 'total_count' => $rows_found, 'next_offset' => $next_offset);
-	}
-
-	/**
-	 * @deprecated
-	 * Disconnects all instances
-	 */
-	public function disconnectAll()
-	{
-		DBManagerFactory::disconnectAll();
-	}
-
-	/**
-	 * This function sets the query threshold limit
-	 *
-	 * @param int $limit value of query threshold limit
-	 */
-	public static function setQueryLimit($limit)
-	{
-		//reset the queryCount
-		self::$queryCount = 0;
-		self::$queryLimit = $limit;
-	}
-
-	/**
-	 * Returns the static queryCount value
-	 *
-	 * @return int value of the queryCount static variable
-	 */
-	public static function getQueryCount()
-	{
-		return self::$queryCount;
-	}
-
-
-	/**
-	 * Resets the queryCount value to 0
-	 *
-	 */
-	public static function resetQueryCount()
-	{
-		self::$queryCount = 0;
-	}
-
-	/**
-	 * This function increments the global $sql_queries variable
-	 */
-	public function countQuery()
-	{
-		if (self::$queryLimit != 0 && ++self::$queryCount > self::$queryLimit
-			&&(empty($GLOBALS['current_user']) || !is_admin($GLOBALS['current_user']))) {
+    public function generateInsertSQL(SugarBean $bean, $select_query, $start, $count = -1, $table, $is_related_query = false)
+    {
+        $this->log->info('call to DBManager::generateInsertSQL() is deprecated');
+        global $sugar_config;
+
+        $rows_found = 0;
+        $count_query = $bean->create_list_count_query($select_query);
+        if(!empty($count_query))
+        {
+            // We have a count query.  Run it and get the results.
+            $result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
+            $assoc = $this->fetchByAssoc($result);
+            if(!empty($assoc['c']))
+            {
+                $rows_found = $assoc['c'];
+            }
+        }
+        if($count == -1){
+            $count 	= $sugar_config['list_max_entries_per_page'];
+        }
+        $next_offset = $start + $count;
+
+        $result = $this->limitQuery($select_query, $start, $count);
+        // get basic insert
+        $sql = "INSERT INTO ".$table;
+        $custom_sql = "INSERT INTO ".$table."_cstm";
+
+        // get field definitions
+        $fields = $bean->getFieldDefinitions();
+        $custom_fields = array();
+
+        if($bean->hasCustomFields()){
+            foreach ($fields as $fieldDef){
+                if($fieldDef['source'] == 'custom_fields'){
+                    $custom_fields[$fieldDef['name']] = $fieldDef['name'];
+                }
+            }
+            if(!empty($custom_fields)){
+                $custom_fields['id_c'] = 'id_c';
+                $id_field = array('name' => 'id_c', 'custom_type' => 'id',);
+                $fields[] = $id_field;
+            }
+        }
+
+        // get column names and values
+        $row_array = array();
+        $columns = array();
+        $cstm_row_array = array();
+        $cstm_columns = array();
+        $built_columns = false;
+        while(($row = $this->fetchByAssoc($result)) != null)
+        {
+            $values = array();
+            $cstm_values = array();
+            if(!$is_related_query){
+                foreach ($fields as $fieldDef)
+                {
+                    if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+                    $val = $row[$fieldDef['name']];
+
+                    //handle auto increment values here only need to do this on insert not create
+                    if ($fieldDef['name'] == 'deleted'){
+                            $values['deleted'] = $val;
+                            if(!$built_columns){
+                            $columns[] = 'deleted';
+                        }
+                    }
+                    else
+                    {
+                        $type = $fieldDef['type'];
+                        if(!empty($fieldDef['custom_type'])){
+                            $type = $fieldDef['custom_type'];
+                        }
+                        // need to do some thing about types of values
+                        if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
+                            if(!empty($custom_fields[$fieldDef['name']]))
+                                $cstm_values[$fieldDef['name']] = 'null';
+                            else
+                                $values[$fieldDef['name']] = 'null';
+                        }else{
+                            if(isset($type) && $type=='int') {
+                                if(!empty($custom_fields[$fieldDef['name']]))
+                                    $cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+                                else
+                                    $values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+                            } else {
+                                if(!empty($custom_fields[$fieldDef['name']]))
+                                    $cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+                                else
+                                    $values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+                            }
+                        }
+                        if(!$built_columns){
+                            if(!empty($custom_fields[$fieldDef['name']]))
+                                $cstm_columns[] = $fieldDef['name'];
+                            else
+                                $columns[] = $fieldDef['name'];
+                        }
+                    }
+
+                }
+            } else {
+            foreach ($row as $key=>$val)
+            {
+                    if($key != 'orc_row'){
+                        $values[$key] = "'$val'";
+                        if(!$built_columns){
+                            $columns[] = $key;
+                        }
+                    }
+            }
+            }
+            $built_columns = true;
+            if(!empty($values)){
+                $row_array[] = $values;
+            }
+            if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
+                $cstm_row_array[] = $cstm_values;
+            }
+        }
+
+        //if (sizeof ($values) == 0) return ""; // no columns set
+
+        // get the entire sql
+        $sql .= "(".implode(",", $columns).") ";
+        $sql .= "VALUES";
+        for($i = 0; $i < count($row_array); $i++){
+            $sql .= " (".implode(",", $row_array[$i]).")";
+            if($i < (count($row_array) - 1)){
+                $sql .= ", ";
+            }
+        }
+        //custom
+        // get the entire sql
+        $custom_sql .= "(".implode(",", $cstm_columns).") ";
+        $custom_sql .= "VALUES";
+
+        for($i = 0; $i < count($cstm_row_array); $i++){
+            $custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
+            if($i < (count($cstm_row_array) - 1)){
+                $custom_sql .= ", ";
+            }
+        }
+        return array('data' => $sql, 'cstm_sql' => $custom_sql, /*'result_count' => $row_count, */ 'total_count' => $rows_found, 'next_offset' => $next_offset);
+    }
+
+    /**
+     * @deprecated
+     * Disconnects all instances
+     */
+    public function disconnectAll()
+    {
+        DBManagerFactory::disconnectAll();
+    }
+
+    /**
+     * This function sets the query threshold limit
+     *
+     * @param int $limit value of query threshold limit
+     */
+    public static function setQueryLimit($limit)
+    {
+        //reset the queryCount
+        self::$queryCount = 0;
+        self::$queryLimit = $limit;
+    }
+
+    /**
+     * Returns the static queryCount value
+     *
+     * @return int value of the queryCount static variable
+     */
+    public static function getQueryCount()
+    {
+        return self::$queryCount;
+    }
+
+
+    /**
+     * Resets the queryCount value to 0
+     *
+     */
+    public static function resetQueryCount()
+    {
+        self::$queryCount = 0;
+    }
+
+    /**
+     * This function increments the global $sql_queries variable
+     */
+    public function countQuery()
+    {
+        if (self::$queryLimit != 0 && ++self::$queryCount > self::$queryLimit
+            &&(empty($GLOBALS['current_user']) || !is_admin($GLOBALS['current_user']))) {
             require_once('include/resource/ResourceManager.php');
             $resourceManager = ResourceManager::getInstance();
             $resourceManager->notifyObservers('ERR_QUERY_LIMIT');
-		}
-	}
+        }
+    }
+
+    /**
+     * Pre-process string for quoting
+     * @internal
+     * @param string $string
+     * @return string
+     */
+    protected function quoteInternal($string)
+    {
+        return from_html($string);
+    }
 
-	/**
-	 * Pre-process string for quoting
-	 * @internal
-	 * @param string $string
+    /**
+     * Return string properly quoted with ''
+     * @param string $string
      * @return string
      */
-	protected function quoteInternal($string)
-	{
-		return from_html($string);
-	}
-
-	/**
-	 * Return string properly quoted with ''
-	 * @param string $string
-	 * @return string
-	 */
-	public function quoted($string)
-	{
-		return "'".$this->quote($string)."'";
-	}
-
-	/**
+    public function quoted($string)
+    {
+        return "'".$this->quote($string)."'";
+    }
+
+    /**
      * Quote value according to type
      * Numerics aren't quoted
      * Dates are converted and quoted
@@ -1544,13 +1544,13 @@ 
      * @return string Quoted value
      */
     public function quoteType($type, $value)
-	{
-	    if($type == 'date') {
-	        return $this->convert($this->quoted($value), "date");
-	    }
-	    if($type == 'time') {
-	        return $this->convert($this->quoted($value), "time");
-	    }
+    {
+        if($type == 'date') {
+            return $this->convert($this->quoted($value), "date");
+        }
+        if($type == 'time') {
+            return $this->convert($this->quoted($value), "time");
+        }
         if(isset($this->type_class[$type]) &&  $this->type_class[$type] == "date") {
             return $this->convert($this->quoted($value), "datetime");
         }
@@ -1559,7 +1559,7 @@ 
         }
 
         return $this->quoted($value);
-	}
+    }
 
     /**
      * Quote the strings of the passed in array
@@ -1569,177 +1569,177 @@ 
      * @param array $array
      * @return array Quoted strings
      */
-	public function arrayQuote(array &$array)
-	{
-		foreach($array as &$val) {
-			$val = $this->quote($val);
-		}
-		return $array;
-	}
+    public function arrayQuote(array &$array)
+    {
+        foreach($array as &$val) {
+            $val = $this->quote($val);
+        }
+        return $array;
+    }
 
     /**
      * Frees out previous results
      *
      * @param resource|bool $result optional, pass if you want to free a single result instead of all results
      */
-	protected function freeResult($result = false)
-	{
-		if($result) {
-			$this->freeDbResult($result);
-		}
-		if($this->lastResult) {
-			$this->freeDbResult($this->lastResult);
-			$this->lastResult = null;
-		}
-	}
-
-	/**
-	 * @abstract
-	 * Check if query has LIMIT clause
-	 * Relevant for now only for Mysql
-	 * @param string $sql
-	 * @return bool
-	 */
-	protected function hasLimit($sql)
-	{
-	    return false;
-	}
-
-	/**
-	 * Runs a query and returns a single row containing single value
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @return array    single value from the query
-	 */
-	public function getOne($sql, $dieOnError = false, $msg = '')
-	{
-		$this->log->info("Get One: |$sql|");
-		if(!$this->hasLimit($sql)) {
-		    $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
-		} else {
-		    // support old code that passes LIMIT to sql
-		    // works only for mysql, so do not rely on this
-		    $queryresult = $this->query($sql, $dieOnError, $msg);
-		}
-		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
-		if (!$queryresult) return false;
-		$row = $this->fetchByAssoc($queryresult);
-		if(!empty($row)) {
-			return array_shift($row);
-		}
-		return false;
-	}
-
-	/**
-	 * Runs a query and returns a single row
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Message to log if error occurs
-	 * @return array    single row from the query
-	 */
-	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		$this->log->info("Fetch One: |$sql|");
-		$this->checkConnection();
-		$queryresult = $this->query($sql, $dieOnError, $msg);
-		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
-
-		if (!$queryresult) return false;
-
-		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
-
-		$this->freeResult($queryresult);
-		return $row;
-	}
+    protected function freeResult($result = false)
+    {
+        if($result) {
+            $this->freeDbResult($result);
+        }
+        if($this->lastResult) {
+            $this->freeDbResult($this->lastResult);
+            $this->lastResult = null;
+        }
+    }
 
     /**
-     * Returns the number of rows affected by the last query
      * @abstract
-	 * See also affected_rows capability, will return 0 unless the DB supports it
-     * @param resource $result query result resource
-     * @return int
+     * Check if query has LIMIT clause
+     * Relevant for now only for Mysql
+     * @param string $sql
+     * @return bool
      */
-	public function getAffectedRowCount($result)
-	{
-		return 0;
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return 0;
-	}
-
-	/**
-     * Get table description
-     * @param string $tablename
+    protected function hasLimit($sql)
+    {
+        return false;
+    }
+
+    /**
+     * Runs a query and returns a single row containing single value
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @return array    single value from the query
+     */
+    public function getOne($sql, $dieOnError = false, $msg = '')
+    {
+        $this->log->info("Get One: |$sql|");
+        if(!$this->hasLimit($sql)) {
+            $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
+        } else {
+            // support old code that passes LIMIT to sql
+            // works only for mysql, so do not rely on this
+            $queryresult = $this->query($sql, $dieOnError, $msg);
+        }
+        $this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
+        if (!$queryresult) return false;
+        $row = $this->fetchByAssoc($queryresult);
+        if(!empty($row)) {
+            return array_shift($row);
+        }
+        return false;
+    }
+
+    /**
+     * Runs a query and returns a single row
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Message to log if error occurs
+     * @return array    single row from the query
+     */
+    public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        $this->log->info("Fetch One: |$sql|");
+        $this->checkConnection();
+        $queryresult = $this->query($sql, $dieOnError, $msg);
+        $this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
+
+        if (!$queryresult) return false;
+
+        $row = $this->fetchByAssoc($queryresult);
+        if ( !$row ) return false;
+
+        $this->freeResult($queryresult);
+        return $row;
+    }
+
+    /**
+     * Returns the number of rows affected by the last query
+     * @abstract
+     * See also affected_rows capability, will return 0 unless the DB supports it
+     * @param resource $result query result resource
+     * @return int
+     */
+    public function getAffectedRowCount($result)
+    {
+        return 0;
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return 0;
+    }
+
+    /**
+     * Get table description
+     * @param string $tablename
      * @param bool $reload true means load from DB, false allows using cache
      * @return array Vardef-format table description
      *
      */
-	public function getTableDescription($tablename, $reload = false)
-	{
-		if($reload || empty(self::$table_descriptions[$tablename])) {
-			self::$table_descriptions[$tablename] = $this->get_columns($tablename);
-		}
-		return self::$table_descriptions[$tablename];
-	}
-
-	/**
-	 * Returns the field description for a given field in table
-	 *
-	 * @param  string $name
-	 * @param  string $tablename
-	 * @return array
-	 */
-	protected function describeField($name, $tablename)
-	{
-		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
-			return 	$table[$name];
-
-		$table = $this->getTableDescription($tablename, true);
-
-		if(isset($table[$name]))
-		return $table[$name];
-
-		return array();
-	}
-
-	/**
-	 * Returns the index description for a given index in table
-	 *
-	 * @param  string $name
-	 * @param  string $tablename
-	 * @return array
-	 */
-	protected function describeIndex($name, $tablename)
-	{
-		if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
-			return 	self::$index_descriptions[$tablename][$name];
-		}
-
-		self::$index_descriptions[$tablename] = $this->get_indices($tablename);
-
-		if(isset(self::$index_descriptions[$tablename][$name])){
-			return 	self::$index_descriptions[$tablename][$name];
-		}
-
-		return array();
-	}
+    public function getTableDescription($tablename, $reload = false)
+    {
+        if($reload || empty(self::$table_descriptions[$tablename])) {
+            self::$table_descriptions[$tablename] = $this->get_columns($tablename);
+        }
+        return self::$table_descriptions[$tablename];
+    }
+
+    /**
+     * Returns the field description for a given field in table
+     *
+     * @param  string $name
+     * @param  string $tablename
+     * @return array
+     */
+    protected function describeField($name, $tablename)
+    {
+        $table = $this->getTableDescription($tablename);
+        if(!empty($table) && isset($table[$name]))
+            return 	$table[$name];
+
+        $table = $this->getTableDescription($tablename, true);
+
+        if(isset($table[$name]))
+        return $table[$name];
+
+        return array();
+    }
+
+    /**
+     * Returns the index description for a given index in table
+     *
+     * @param  string $name
+     * @param  string $tablename
+     * @return array
+     */
+    protected function describeIndex($name, $tablename)
+    {
+        if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
+            return 	self::$index_descriptions[$tablename][$name];
+        }
+
+        self::$index_descriptions[$tablename] = $this->get_indices($tablename);
+
+        if(isset(self::$index_descriptions[$tablename][$name])){
+            return 	self::$index_descriptions[$tablename][$name];
+        }
+
+        return array();
+    }
 
     /**
      * Truncates a string to a given length
@@ -1749,14 +1749,14 @@ 
      * @return string
      *
      */
-	public function truncate($string, $len)
-	{
-		if ( is_numeric($len) && $len > 0)
-		{
-			$string = mb_substr($string,0,(int) $len, "UTF-8");
-		}
-		return $string;
-	}
+    public function truncate($string, $len)
+    {
+        if ( is_numeric($len) && $len > 0)
+        {
+            $string = mb_substr($string,0,(int) $len, "UTF-8");
+        }
+        return $string;
+    }
 
     /**
      * Returns the database string needed for concatinating multiple database strings together
@@ -1766,121 +1766,121 @@ 
      * @param string $space Separator between strings, default is single space
      * @return string
      */
-	public function concat($table, array $fields, $space = ' ')
-	{
-		if(empty($fields)) return '';
-		$elems = array();
-		$space = $this->quoted($space);
-		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
-			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
-		}
-		$first = array_shift($elems);
-		return "LTRIM(RTRIM(".$this->convert($first, 'CONCAT', $elems)."))";
-	}
-
-	/**
-	 * Given a sql stmt attempt to parse it into the sql and the tokens. Then return the index of this prepared statement
-	 * Tokens can come in the following forms:
-	 * ? - a scalar which will be quoted
-	 * ! - a literal which will not be quoted
-	 * & - binary data to read from a file
-	 *
-	 * @param  string	$sql        The sql to parse
-	 * @return int index of the prepared statement to be used with execute
-	 */
-	public function prepareQuery($sql)
-	{
-		//parse out the tokens
-		$tokens = preg_split('/((?<!\\\)[&?!])/', $sql, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-		//maintain a count of the actual tokens for quick reference in execute
-		$count = 0;
-
-		$sqlStr = '';
-		foreach ($tokens as $key => $val) {
-			switch ($val) {
-				case '?' :
-				case '!' :
-				case '&' :
-					$count++;
-					$sqlStr .= '?';
-					break;
-
-				default :
-					//escape any special characters
-					$tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
-					$sqlStr .= $tokens[$key];
-					break;
-			} // switch
-		} // foreach
-
-		$this->preparedTokens[] = array('tokens' => $tokens, 'tokenCount' => $count, 'sqlString' => $sqlStr);
-		end($this->preparedTokens);
-		return key($this->preparedTokens);
-	}
-
-	/**
-	 * Takes a prepared stmt index and the data to replace and creates the query and runs it.
-	 *
-	 * @param  int		$stmt       The index of the prepared statement from preparedTokens
-	 * @param  array    $data 		The array of data to replace the tokens with.
-	 * @return resource result set or false on error
-	 */
-	public function executePreparedQuery($stmt, $data = array())
-	{
-		if(!empty($this->preparedTokens[$stmt])){
-			if(!is_array($data)){
-				$data = array($data);
-			}
-
-			$pTokens = $this->preparedTokens[$stmt];
-
-			//ensure that the number of data elements matches the number of replacement tokens
-			//we found in prepare().
-			if(count($data) != $pTokens['tokenCount']){
-				//error the data count did not match the token count
-				return false;
-			}
-
-			$query = '';
-			$dataIndex = 0;
-			$tokens = $pTokens['tokens'];
-			foreach ($tokens as $val) {
-				switch ($val) {
-					case '?':
-						$query .= $this->quote($data[$dataIndex++]);
-						break;
-					case '&':
-						$filename = $data[$dataIndex++];
-						$query .= file_get_contents($filename);
-						break;
-					case '!':
-						$query .= $data[$dataIndex++];
-						break;
-					default:
-						$query .= $val;
-						break;
-				}//switch
-			}//foreach
-			return $this->query($query);
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Run both prepare and execute without the client having to run both individually.
-	 *
-	 * @param  string	$sql        The sql to parse
-	 * @param  array    $data 		The array of data to replace the tokens with.
-	 * @return resource result set or false on error
-	 */
-	public function pQuery($sql, $data = array())
-	{
-		$stmt = $this->prepareQuery($sql);
-		return $this->executePreparedQuery($stmt, $data);
-	}
+    public function concat($table, array $fields, $space = ' ')
+    {
+        if(empty($fields)) return '';
+        $elems = array();
+        $space = $this->quoted($space);
+        foreach ( $fields as $field ) {
+            if(!empty($elems)) $elems[] = $space;
+            $elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
+        }
+        $first = array_shift($elems);
+        return "LTRIM(RTRIM(".$this->convert($first, 'CONCAT', $elems)."))";
+    }
+
+    /**
+     * Given a sql stmt attempt to parse it into the sql and the tokens. Then return the index of this prepared statement
+     * Tokens can come in the following forms:
+     * ? - a scalar which will be quoted
+     * ! - a literal which will not be quoted
+     * & - binary data to read from a file
+     *
+     * @param  string	$sql        The sql to parse
+     * @return int index of the prepared statement to be used with execute
+     */
+    public function prepareQuery($sql)
+    {
+        //parse out the tokens
+        $tokens = preg_split('/((?<!\\\)[&?!])/', $sql, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        //maintain a count of the actual tokens for quick reference in execute
+        $count = 0;
+
+        $sqlStr = '';
+        foreach ($tokens as $key => $val) {
+            switch ($val) {
+                case '?' :
+                case '!' :
+                case '&' :
+                    $count++;
+                    $sqlStr .= '?';
+                    break;
+
+                default :
+                    //escape any special characters
+                    $tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
+                    $sqlStr .= $tokens[$key];
+                    break;
+            } // switch
+        } // foreach
+
+        $this->preparedTokens[] = array('tokens' => $tokens, 'tokenCount' => $count, 'sqlString' => $sqlStr);
+        end($this->preparedTokens);
+        return key($this->preparedTokens);
+    }
+
+    /**
+     * Takes a prepared stmt index and the data to replace and creates the query and runs it.
+     *
+     * @param  int		$stmt       The index of the prepared statement from preparedTokens
+     * @param  array    $data 		The array of data to replace the tokens with.
+     * @return resource result set or false on error
+     */
+    public function executePreparedQuery($stmt, $data = array())
+    {
+        if(!empty($this->preparedTokens[$stmt])){
+            if(!is_array($data)){
+                $data = array($data);
+            }
+
+            $pTokens = $this->preparedTokens[$stmt];
+
+            //ensure that the number of data elements matches the number of replacement tokens
+            //we found in prepare().
+            if(count($data) != $pTokens['tokenCount']){
+                //error the data count did not match the token count
+                return false;
+            }
+
+            $query = '';
+            $dataIndex = 0;
+            $tokens = $pTokens['tokens'];
+            foreach ($tokens as $val) {
+                switch ($val) {
+                    case '?':
+                        $query .= $this->quote($data[$dataIndex++]);
+                        break;
+                    case '&':
+                        $filename = $data[$dataIndex++];
+                        $query .= file_get_contents($filename);
+                        break;
+                    case '!':
+                        $query .= $data[$dataIndex++];
+                        break;
+                    default:
+                        $query .= $val;
+                        break;
+                }//switch
+            }//foreach
+            return $this->query($query);
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Run both prepare and execute without the client having to run both individually.
+     *
+     * @param  string	$sql        The sql to parse
+     * @param  array    $data 		The array of data to replace the tokens with.
+     * @return resource result set or false on error
+     */
+    public function pQuery($sql, $data = array())
+    {
+        $stmt = $this->prepareQuery($sql);
+        return $this->executePreparedQuery($stmt, $data);
+    }
 
 /********************** SQL FUNCTIONS ****************************/
     /**
@@ -1890,933 +1890,933 @@ 
      * @param SugarBean $bean SugarBean instance
      * @return string SQL Create Table statement
      */
-	public function createTableSQL(SugarBean $bean)
-	{
-		$tablename = $bean->getTableName();
-		$fieldDefs = $bean->getFieldDefinitions();
-		$indices = $bean->getIndices();
-		return $this->createTableSQLParams($tablename, $fieldDefs, $indices);
-	}
-
-	/**
-	 * Generates SQL for insert statement.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @return string SQL Create Table statement
-	 */
-	public function insertSQL(SugarBean $bean)
-	{
-		// get column names and values
-		$sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
-		        isset($bean->field_name_map)?$bean->field_name_map:null, false);
-		return $sql;
-	}
-
-	/**
-	 * Generates SQL for update statement.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where Optional, where conditions in an array
-	 * @return string SQL Create Table statement
-	 */
-	public function updateSQL(SugarBean $bean, array $where = array())
-	{
-		$primaryField = $bean->getPrimaryFieldDefinition();
-		$columns = array();
+    public function createTableSQL(SugarBean $bean)
+    {
+        $tablename = $bean->getTableName();
+        $fieldDefs = $bean->getFieldDefinitions();
+        $indices = $bean->getIndices();
+        return $this->createTableSQLParams($tablename, $fieldDefs, $indices);
+    }
+
+    /**
+     * Generates SQL for insert statement.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @return string SQL Create Table statement
+     */
+    public function insertSQL(SugarBean $bean)
+    {
+        // get column names and values
+        $sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
+                isset($bean->field_name_map)?$bean->field_name_map:null, false);
+        return $sql;
+    }
+
+    /**
+     * Generates SQL for update statement.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where Optional, where conditions in an array
+     * @return string SQL Create Table statement
+     */
+    public function updateSQL(SugarBean $bean, array $where = array())
+    {
+        $primaryField = $bean->getPrimaryFieldDefinition();
+        $columns = array();
         $fields = $bean->getFieldDefinitions();
-		// get column names and values
-		foreach ($fields as $field => $fieldDef) {
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
-			// Do not write out the id field on the update statement.
-    		// We are not allowed to change ids.
-    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
-
-    		// If the field is an auto_increment field, then we shouldn't be setting it.  This was added
-    		// specially for Bugs and Cases which have a number associated with them.
-    		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
-
-    		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
-
-    		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
-
-    		if(isset($bean->$field)) {
-    			$val = from_html($bean->$field);
-    		} else {
-    			continue;
-    		}
-
-    		if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
-    			$val = $bean->getFieldValue($field);
-    		}
-
-    		if(strlen($val) == 0) {
-    			if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
-    				$val = $fieldDef['default'];
-    			} else {
-    				$val = null;
-    			}
-    		}
-
-    		if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
-			    $val = $this->truncate($val, $fieldDef['len']);
-			}
-		$columnName = $this->quoteIdentifier($fieldDef['name']);
-    		if(!is_null($val) || !empty($fieldDef['required'])) {
-    			$columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
-    		} elseif($this->isNullable($fieldDef)) {
-    			$columns[] = "{$columnName}=NULL";
-    		} else {
-    		    $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
-    		}
-		}
-
-		if ( sizeof($columns) == 0 )
-			return ""; // no columns set
-
-		// build where clause
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		if(isset($fields['deleted'])) {
-		    $where .= " AND deleted=0";
-		}
-
-		return "UPDATE ".$bean->getTableName()."
+        // get column names and values
+        foreach ($fields as $field => $fieldDef) {
+            if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+            // Do not write out the id field on the update statement.
+            // We are not allowed to change ids.
+            if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
+
+            // If the field is an auto_increment field, then we shouldn't be setting it.  This was added
+            // specially for Bugs and Cases which have a number associated with them.
+            if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
+
+            //custom fields handle their save separately
+            if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+
+            // no need to clear deleted since we only update not deleted records anyway
+            if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+
+            if(isset($bean->$field)) {
+                $val = from_html($bean->$field);
+            } else {
+                continue;
+            }
+
+            if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
+                $val = $bean->getFieldValue($field);
+            }
+
+            if(strlen($val) == 0) {
+                if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+                    $val = $fieldDef['default'];
+                } else {
+                    $val = null;
+                }
+            }
+
+            if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+                $val = $this->truncate($val, $fieldDef['len']);
+            }
+        $columnName = $this->quoteIdentifier($fieldDef['name']);
+            if(!is_null($val) || !empty($fieldDef['required'])) {
+                $columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
+            } elseif($this->isNullable($fieldDef)) {
+                $columns[] = "{$columnName}=NULL";
+            } else {
+                $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
+            }
+        }
+
+        if ( sizeof($columns) == 0 )
+            return ""; // no columns set
+
+        // build where clause
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        if(isset($fields['deleted'])) {
+            $where .= " AND deleted=0";
+        }
+
+        return "UPDATE ".$bean->getTableName()."
 					SET ".implode(",", $columns)."
 					$where";
-	}
-
-	/**
-	 * This method returns a where array so that it has id entry if
-	 * where is not an array or is empty
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where Optional, where conditions in an array
-	 * @return array
-	 */
-	protected function updateWhereArray(SugarBean $bean, array $where = array())
-	{
-		if (count($where) == 0) {
-			$fieldDef = $bean->getPrimaryFieldDefinition();
-			$primaryColumn = $fieldDef['name'];
-
-			$val = $bean->getFieldValue($fieldDef['name']);
-			if ($val != FALSE){
-				$where[$primaryColumn] = $val;
-			}
-		}
-
-		return $where;
-	}
-
-	/**
-	 * Returns a where clause without the 'where' key word
-	 *
-	 * The clause returned does not have an 'and' at the beginning and the columns
-	 * are joined by 'and'.
-	 *
-	 * @param  string $table table name
-	 * @param  array  $whereArray Optional, where conditions in an array
-	 * @return string
-	 */
-	protected function getColumnWhereClause($table, array $whereArray = array())
-	{
-		$where = array();
-		foreach ($whereArray as $name => $val) {
-			$op = "=";
-			if (is_array($val)) {
-				$op = "IN";
-				$temp = array();
-				foreach ($val as $tval){
-					$temp[] = $this->quoted($tval);
-				}
-				$val = implode(",", $temp);
-				$val = "($val)";
-			} else {
-				$val = $this->quoted($val);
-			}
-
-			$where[] = " $table.$name $op $val";
-		}
-
-		if (!empty($where))
-			return implode(" AND ", $where);
-
-		return '';
-	}
-
-	/**
-	 * This method returns a complete where clause built from the
-	 * where values specified.
-	 *
-	 * @param  SugarBean $bean SugarBean that describes the table
-	 * @param  array  $whereArray Optional, where conditions in an array
-	 * @return string
-	 */
-	protected function getWhereClause(SugarBean $bean, array $whereArray=array())
-	{
-	    return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
-	}
-
-	/**
-	 * Outputs a correct string for the sql statement according to value
-	 *
-	 * @param  mixed $val
-	 * @param  array $fieldDef field definition
-	 * @return mixed
-	 */
-	public function massageValue($val, $fieldDef)
-	{
-		$type = $this->getFieldType($fieldDef);
-
-		if(isset($this->type_class[$type])) {
-			// handle some known types
-			switch($this->type_class[$type]) {
-				case 'bool':
-				case 'int':
-					if (!empty($fieldDef['required']) && $val == ''){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
-					return intval($val);
+    }
+
+    /**
+     * This method returns a where array so that it has id entry if
+     * where is not an array or is empty
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where Optional, where conditions in an array
+     * @return array
+     */
+    protected function updateWhereArray(SugarBean $bean, array $where = array())
+    {
+        if (count($where) == 0) {
+            $fieldDef = $bean->getPrimaryFieldDefinition();
+            $primaryColumn = $fieldDef['name'];
+
+            $val = $bean->getFieldValue($fieldDef['name']);
+            if ($val != FALSE){
+                $where[$primaryColumn] = $val;
+            }
+        }
+
+        return $where;
+    }
+
+    /**
+     * Returns a where clause without the 'where' key word
+     *
+     * The clause returned does not have an 'and' at the beginning and the columns
+     * are joined by 'and'.
+     *
+     * @param  string $table table name
+     * @param  array  $whereArray Optional, where conditions in an array
+     * @return string
+     */
+    protected function getColumnWhereClause($table, array $whereArray = array())
+    {
+        $where = array();
+        foreach ($whereArray as $name => $val) {
+            $op = "=";
+            if (is_array($val)) {
+                $op = "IN";
+                $temp = array();
+                foreach ($val as $tval){
+                    $temp[] = $this->quoted($tval);
+                }
+                $val = implode(",", $temp);
+                $val = "($val)";
+            } else {
+                $val = $this->quoted($val);
+            }
+
+            $where[] = " $table.$name $op $val";
+        }
+
+        if (!empty($where))
+            return implode(" AND ", $where);
+
+        return '';
+    }
+
+    /**
+     * This method returns a complete where clause built from the
+     * where values specified.
+     *
+     * @param  SugarBean $bean SugarBean that describes the table
+     * @param  array  $whereArray Optional, where conditions in an array
+     * @return string
+     */
+    protected function getWhereClause(SugarBean $bean, array $whereArray=array())
+    {
+        return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
+    }
+
+    /**
+     * Outputs a correct string for the sql statement according to value
+     *
+     * @param  mixed $val
+     * @param  array $fieldDef field definition
+     * @return mixed
+     */
+    public function massageValue($val, $fieldDef)
+    {
+        $type = $this->getFieldType($fieldDef);
+
+        if(isset($this->type_class[$type])) {
+            // handle some known types
+            switch($this->type_class[$type]) {
+                case 'bool':
+                case 'int':
+                    if (!empty($fieldDef['required']) && $val == ''){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
+                    return intval($val);
                 case 'bigint' :
                     $val = (float)$val;
-					if (!empty($fieldDef['required']) && $val == false){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
+                    if (!empty($fieldDef['required']) && $val == false){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
                     return $val;
-				case 'float':
-					if (!empty($fieldDef['required'])  && $val == ''){
-						if (isset($fieldDef['default'])){
-							return $fieldDef['default'];
-						}
-						return 0;
-					}
-					return floatval($val);
-				case 'time':
-				case 'date':
-					// empty date can't be '', so convert it to either NULL or empty date value
-					if($val == '') {
-						if (!empty($fieldDef['required'])) {
-							if (isset($fieldDef['default'])) {
-								return $fieldDef['default'];
-							}
-							return $this->emptyValue($type);
-						}
-						return "NULL";
-					}
-					break;
-			}
-		} else {
-		    if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
-			    $val = $this->truncate($val, $fieldDef['len']);
-			}
-		}
-
-		if ( is_null($val) ) {
-			if(!empty($fieldDef['required'])) {
-				if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
-					return $fieldDef['default'];
-				}
-				return $this->emptyValue($type);
-			} else {
-				return "NULL";
-			}
-		}
+                case 'float':
+                    if (!empty($fieldDef['required'])  && $val == ''){
+                        if (isset($fieldDef['default'])){
+                            return $fieldDef['default'];
+                        }
+                        return 0;
+                    }
+                    return floatval($val);
+                case 'time':
+                case 'date':
+                    // empty date can't be '', so convert it to either NULL or empty date value
+                    if($val == '') {
+                        if (!empty($fieldDef['required'])) {
+                            if (isset($fieldDef['default'])) {
+                                return $fieldDef['default'];
+                            }
+                            return $this->emptyValue($type);
+                        }
+                        return "NULL";
+                    }
+                    break;
+            }
+        } else {
+            if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+                $val = $this->truncate($val, $fieldDef['len']);
+            }
+        }
+
+        if ( is_null($val) ) {
+            if(!empty($fieldDef['required'])) {
+                if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
+                    return $fieldDef['default'];
+                }
+                return $this->emptyValue($type);
+            } else {
+                return "NULL";
+            }
+        }
         if($type == "datetimecombo") {
             $type = "datetime";
         }
-		return $this->convert($this->quoted($val), $type);
-	}
-
-	/**
-	 * Massages the field defintions to fill in anything else the DB backend may add
-	 *
-	 * @param  array  $fieldDef
-	 * @param  string $tablename
-	 * @return array
-	 */
-	public function massageFieldDef(&$fieldDef, $tablename)
-	{
-		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
-				$fieldDef['dbType'] = $fieldDef['dbtype'];
-			else
-				$fieldDef['dbType'] = $fieldDef['type'];
-		}
-		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
-		$matches = array();
+        return $this->convert($this->quoted($val), $type);
+    }
+
+    /**
+     * Massages the field defintions to fill in anything else the DB backend may add
+     *
+     * @param  array  $fieldDef
+     * @param  string $tablename
+     * @return array
+     */
+    public function massageFieldDef(&$fieldDef, $tablename)
+    {
+        if ( !isset($fieldDef['dbType']) ) {
+            if ( isset($fieldDef['dbtype']) )
+                $fieldDef['dbType'] = $fieldDef['dbtype'];
+            else
+                $fieldDef['dbType'] = $fieldDef['type'];
+        }
+        $type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
+        $matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
-			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
-			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
-			$fieldDef['len'] .= ",{$fieldDef['precision']}";
-		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
-			$fieldDef['required'] = 'true';
-		}
-	}
-
-	/**
-	 * Take an SQL statement and produce a list of fields used in that select
-	 * @param string $selectStatement
-	 * @return array
-	 */
-	public function getSelectFieldsFromQuery($selectStatement)
-	{
-		$selectStatement = trim($selectStatement);
-		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
-			$selectStatement = trim(substr($selectStatement, 6));
-
-		//Due to sql functions existing in many selects, we can't use php explode
-		$fields = array();
-		$level = 0;
-		$selectField = "";
-		$strLen = strlen($selectStatement);
-		for($i = 0; $i < $strLen; $i++)
-		{
-			$char = $selectStatement[$i];
-
-			if ($char == "," && $level == 0)
-			{
-				$field = $this->getFieldNameFromSelect(trim($selectField));
-				$fields[$field] = $selectField;
-				$selectField = "";
-			}
-			else if ($char == "("){
-				$level++;
-				$selectField .= $char;
-			}
-			else if($char == ")"){
-				$level--;
-				$selectField .= $char;
-
-
-			}else{
-				$selectField .= $char;
-			}
-
-		}
-		$fields[$this->getFieldNameFromSelect($selectField)] = $selectField;
-		return $fields;
-	}
-
-	/**
-	 * returns the field name used in a select
-	 * @param string $string SELECT query
+        if ( isset($matches[1][0]) )
+            $fieldDef['type'] = $matches[1][0];
+        if ( isset($matches[2][0]) && empty($fieldDef['len']) )
+            $fieldDef['len'] = $matches[2][0];
+        if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
+            $fieldDef['len'] .= ",{$fieldDef['precision']}";
+        if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
+            $fieldDef['required'] = 'true';
+        }
+    }
+
+    /**
+     * Take an SQL statement and produce a list of fields used in that select
+     * @param string $selectStatement
+     * @return array
+     */
+    public function getSelectFieldsFromQuery($selectStatement)
+    {
+        $selectStatement = trim($selectStatement);
+        if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
+            $selectStatement = trim(substr($selectStatement, 6));
+
+        //Due to sql functions existing in many selects, we can't use php explode
+        $fields = array();
+        $level = 0;
+        $selectField = "";
+        $strLen = strlen($selectStatement);
+        for($i = 0; $i < $strLen; $i++)
+        {
+            $char = $selectStatement[$i];
+
+            if ($char == "," && $level == 0)
+            {
+                $field = $this->getFieldNameFromSelect(trim($selectField));
+                $fields[$field] = $selectField;
+                $selectField = "";
+            }
+            else if ($char == "("){
+                $level++;
+                $selectField .= $char;
+            }
+            else if($char == ")"){
+                $level--;
+                $selectField .= $char;
+
+
+            }else{
+                $selectField .= $char;
+            }
+
+        }
+        $fields[$this->getFieldNameFromSelect($selectField)] = $selectField;
+        return $fields;
+    }
+
+    /**
+     * returns the field name used in a select
+     * @param string $string SELECT query
      * @return string
      */
-	protected function getFieldNameFromSelect($string)
-	{
-		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
-			$string = substr($string, 9);
-		}
-		if (stripos($string, " as ") !== false)
-			//"as" used for an alias
-			return trim(substr($string, strripos($string, " as ") + 4));
-		else if (strrpos($string, " ") != 0)
-			//Space used as a delimiter for an alias
-			return trim(substr($string, strrpos($string, " ")));
-		else if (strpos($string, ".") !== false)
-			//No alias, but a table.field format was used
-			return substr($string, strpos($string, ".") + 1);
-		else
-			//Give up and assume the whole thing is the field name
-			return $string;
-	}
-
-	/**
-	 * Generates SQL for delete statement identified by id.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $where where conditions in an array
-	 * @return string SQL Update Statement
-	 */
-	public function deleteSQL(SugarBean $bean, array $where)
-	{
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		return "UPDATE ".$bean->getTableName()." SET deleted=1 $where";
-	}
+    protected function getFieldNameFromSelect($string)
+    {
+        if(strncasecmp($string, "DISTINCT ", 9) == 0) {
+            $string = substr($string, 9);
+        }
+        if (stripos($string, " as ") !== false)
+            //"as" used for an alias
+            return trim(substr($string, strripos($string, " as ") + 4));
+        else if (strrpos($string, " ") != 0)
+            //Space used as a delimiter for an alias
+            return trim(substr($string, strrpos($string, " ")));
+        else if (strpos($string, ".") !== false)
+            //No alias, but a table.field format was used
+            return substr($string, strpos($string, ".") + 1);
+        else
+            //Give up and assume the whole thing is the field name
+            return $string;
+    }
+
+    /**
+     * Generates SQL for delete statement identified by id.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where where conditions in an array
+     * @return string SQL Update Statement
+     */
+    public function deleteSQL(SugarBean $bean, array $where)
+    {
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        return "UPDATE ".$bean->getTableName()." SET deleted=1 $where";
+    }
+
+    /**
+     * Generates SQL for select statement for any bean identified by id.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $where where conditions in an array
+     * @return string SQL Select Statement
+     */
+    public function retrieveSQL(SugarBean $bean, array $where)
+    {
+        $where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
+        return "SELECT * FROM ".$bean->getTableName()." $where AND deleted=0";
+    }
+
+    /**
+     * This method implements a generic sql for a collection of beans.
+     *
+     * Currently, this function does not support outer joins.
+     *
+     * @param array $beans Array of values returned by get_class method as the keys and a bean as
+     *      the value for that key. These beans will be joined in the sql by the key
+     *      attribute of field defs.
+     * @param  array $cols Optional, columns to be returned with the keys as names of bean
+     *      as identified by get_class of bean. Values of this array is the array of fieldDefs
+     *      to be returned for a bean. If an empty array is passed, all columns are selected.
+     * @param  array $whereClause Optional, values with the keys as names of bean as identified
+     *      by get_class of bean. Each value at the first level is an array of values for that
+     *      bean identified by name of fields. If we want to pass multiple values for a name,
+     *      pass it as an array. If where is not passed, all the rows will be returned.
+     *
+     * @return string SQL Select Statement
+     */
+    public function retrieveViewSQL(array $beans, array $cols = array(), array $whereClause = array())
+    {
+        $relations = array(); // stores relations between tables as they are discovered
+        $where = $select = array();
+        foreach ($beans as $beanID => $bean) {
+            $tableName = $bean->getTableName();
+            $beanTables[$beanID] = $tableName;
+
+            $table = $beanID;
+            $tables[$table] = $tableName;
+            $aliases[$tableName][] = $table;
+
+            // build part of select for this table
+            if (is_array($cols[$beanID]))
+                foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+
+            // build part of where clause
+            if (is_array($whereClause[$beanID])){
+                $where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
+            }
+            // initialize so that it can be used properly in form clause generation
+            $table_used_in_from[$table] = false;
+
+            $indices = $bean->getIndices();
+            foreach ($indices as $index){
+                if ($index['type'] == 'foreign') {
+                    $relationship[$table][] = array('foreignTable'=> $index['foreignTable']
+                                                ,'foreignColumn'=>$index['foreignField']
+                                                ,'localColumn'=> $index['fields']
+                                                );
+                }
+            }
+            $where[] = " $table.deleted = 0";
+        }
+
+        // join these clauses
+        $select = !empty($select) ? implode(",", $select) : "*";
+        $where = implode(" AND ", $where);
+
+        // generate the from clause. Use relations array to generate outer joins
+        // all the rest of the tables will be used as a simple from
+        // relations table define relations between table1 and table2 through column on table 1
+        // table2 is assumed to joining through primary key called id
+        $separator = "";
+        $from = ''; $table_used_in_from = array();
+        foreach ($relations as $table1 => $rightsidearray){
+            if ($table_used_in_from[$table1]) continue; // table has been joined
+
+            $from .= $separator." ".$table1;
+            $table_used_in_from[$table1] = true;
+            foreach ($rightsidearray as $tablearray){
+                $table2 = $tablearray['foreignTable']; // get foreign table
+                $tableAlias = $aliases[$table2]; // get a list of aliases for this table
+                foreach ($tableAlias as $table2) {
+                    //choose first alias that does not match
+                    // we are doing this because of self joins.
+                    // in case of self joins, the same table will have many aliases.
+                    if ($table2 != $table1) break;
+                }
+
+                $col = $tablearray['foreingColumn'];
+                $name = $tablearray['localColumn'];
+                $from .= " LEFT JOIN $table on ($table1.$name = $table2.$col)";
+                $table_used_in_from[$table2] = true;
+            }
+            $separator = ",";
+        }
+
+        return "SELECT $select FROM $from WHERE $where";
+    }
+
+    /**
+     * Generates SQL for create index statement for a bean.
+     *
+     * @param  SugarBean $bean SugarBean instance
+     * @param  array  $fields fields used in the index
+     * @param  string $name index name
+     * @param  bool   $unique Optional, set to true if this is an unique index
+     * @return string SQL Select Statement
+     */
+    public function createIndexSQL(SugarBean $bean, array $fields, $name, $unique = true)
+    {
+        $unique = ($unique) ? "unique" : "";
+        $tablename = $bean->getTableName();
+        $columns = array();
+        // get column names
+        foreach ($fields as $fieldDef)
+            $columns[] = $fieldDef['name'];
+
+        if (empty($columns))
+            return "";
+
+        $columns = implode(",", $columns);
+
+        return "CREATE $unique INDEX $name ON $tablename ($columns)";
+    }
+
+    /**
+     * Returns the type of the variable in the field
+     *
+     * @param  array $fieldDef Vardef-format field def
+     * @return string
+     */
+    public function getFieldType($fieldDef)
+    {
+        // get the type for db type. if that is not set,
+        // get it from type. This is done so that
+        // we do not have change a lot of existing code
+        // and add dbtype where type is being used for some special
+        // purposes like referring to foreign table etc.
+        if(!empty($fieldDef['dbType']))
+            return  $fieldDef['dbType'];
+        if(!empty($fieldDef['dbtype']))
+            return  $fieldDef['dbtype'];
+        if (!empty($fieldDef['type']))
+            return  $fieldDef['type'];
+        if (!empty($fieldDef['Type']))
+            return  $fieldDef['Type'];
+        if (!empty($fieldDef['data_type']))
+            return  $fieldDef['data_type'];
+
+        return null;
+    }
+
+    /**
+     * retrieves the different components from the passed column type as it is used in the type mapping and vardefs
+     * type format: <baseType>[(<len>[,<scale>])]
+     * @param string $type Column type
+     * @return array|bool array containing the different components of the passed in type or false in case the type contains illegal characters
+     */
+    public function getTypeParts($type)
+    {
+        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
+        {
+            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
+            $return['baseType'] = $matches['type'];
+            if( isset($matches['arg'])) {
+                $return['arg'] = $matches['arg'];
+            }
+            if( isset($matches['len'])) {
+                $return['len'] = $matches['len'];
+            }
+            if( isset($matches['scale'])) {
+                $return['scale'] = $matches['scale'];
+            }
+            return $return;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the defintion for a single column
+     *
+     * @param  array  $fieldDef Vardef-format field def
+     * @param  bool   $ignoreRequired  Optional, true if we should ignore this being a required field
+     * @param  string $table           Optional, table name
+     * @param  bool   $return_as_array Optional, true if we should return the result as an array instead of sql
+     * @return string or array if $return_as_array is true
+     */
+    protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
+    {
+        $name = $fieldDef['name'];
+        $type = $this->getFieldType($fieldDef);
+        $colType = $this->getColumnType($type);
+
+        if($parts = $this->getTypeParts($colType))
+        {
+            $colBaseType = $parts['baseType'];
+            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+        }
+
+        if(!empty($fieldDef['len'])) {
+            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
+                                            'clob', 'blob', 'text'))) {
+                    $colType = "$colBaseType(${fieldDef['len']})";
+            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
+                    if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
+                        if(strpos($fieldDef['len'],',') === false){
+                            $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
+                        }else{
+                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                        }
+                    else
+                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                }
+        } else {
+            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
+                $colType = "$colBaseType($defLen)";
+            }
+        }
+
+        $default = '';
+
+        // Bug #52610 We should have ability don't add DEFAULT part to query for boolean fields
+        if (!empty($fieldDef['no_default']))
+        {
+            // nothing to do
+        }
+        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
+        {
+            $default = " DEFAULT ".$this->quoted($fieldDef['default']);
+        }
+        elseif (!isset($default) && $type == 'bool')
+        {
+            $default = " DEFAULT 0 ";
+        }
+
+        $auto_increment = '';
+        if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
+            $auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+
+        $required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
+        //Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
+        if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
+            (!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
+            $required =  "NOT NULL";
+        }
+        // If the field is marked both required & isnull=>false - alwqys make it not null
+        // Use this to ensure primary key fields never defined as null
+        if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
+            && !empty($fieldDef['required'])) {
+            $required =  "NOT NULL";
+        }
+        if ($ignoreRequired)
+            $required = "";
+
+        if ( $return_as_array ) {
+            return array(
+                'name' => $name,
+                'colType' => $colType,
+                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
+                'default' => $default,
+                'required' => $required,
+                'auto_increment' => $auto_increment,
+                'full' => "$name $colType $default $required $auto_increment",
+                );
+        } else {
+            return "$name $colType $default $required $auto_increment";
+        }
+    }
+
+    /**
+     * Returns SQL defintions for all columns in a table
+     *
+     * @param  array  $fieldDefs  Vardef-format field def
+     * @param  bool   $ignoreRequired Optional, true if we should ignor this being a required field
+     * @param  string $tablename      Optional, table name
+     * @return string SQL column definitions
+     */
+    protected function columnSQLRep($fieldDefs, $ignoreRequired = false, $tablename)
+    {
+        $columns = array();
+
+        if ($this->isFieldArray($fieldDefs)) {
+            foreach ($fieldDefs as $fieldDef) {
+                if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
+                    $columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
+                }
+            }
+            $columns = implode(",", $columns);
+        }
+        else {
+            $columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
+        }
+
+        return $columns;
+    }
+
+    /**
+     * Returns the next value for an auto increment
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @return string
+     */
+    public function getAutoIncrement($table, $field_name)
+    {
+        return "";
+    }
+
+    /**
+     * Returns the sql for the next value in a sequence
+     * @abstract
+     * @param  string $table  Table name
+     * @param  string $field_name  Field name
+     * @return string
+     */
+    public function getAutoIncrementSQL($table, $field_name)
+    {
+        return "";
+    }
+
+    /**
+     * Either creates an auto increment through queries or returns sql for auto increment
+     * that can be appended to the end of column defination (mysql)
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @return string
+     */
+    protected function setAutoIncrement($table, $field_name)
+    {
+        $this->deleteAutoIncrement($table, $field_name);
+        return "";
+    }
+
+    /**
+     * Sets the next auto-increment value of a column to a specific value.
+     * @abstract
+     * @param  string $table Table name
+     * @param  string $field_name Field name
+     * @param  int $start_value  Starting autoincrement value
+     * @return string
+     *
+     */
+    public function setAutoIncrementStart($table, $field_name, $start_value)
+    {
+        return "";
+    }
+
+    /**
+     * Deletes an auto increment
+     * @abstract
+     * @param string $table tablename
+     * @param string $field_name
+     */
+    public function deleteAutoIncrement($table, $field_name)
+    {
+        return;
+    }
+
+    /**
+     * This method generates sql for adding a column to table identified by field def.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @return string SQL statement
+     */
+    public function addColumnSQL($tablename, $fieldDefs)
+    {
+        return $this->changeColumnSQL($tablename, $fieldDefs, 'add');
+    }
+
+    /**
+     * This method genrates sql for altering old column identified by oldFieldDef to new fieldDef.
+     *
+     * @param  string $tablename
+     * @param  array  $newFieldDefs
+     * @param  bool  $ignorerequired Optional, true if we should ignor this being a required field
+     * @return string|array SQL statement(s)
+     */
+    public function alterColumnSQL($tablename, $newFieldDefs, $ignorerequired = false)
+    {
+        return $this->changeColumnSQL($tablename, $newFieldDefs, 'modify', $ignorerequired);
+    }
 
     /**
-     * Generates SQL for select statement for any bean identified by id.
+     * Generates SQL for dropping a table.
      *
-     * @param  SugarBean $bean SugarBean instance
-     * @param  array  $where where conditions in an array
-     * @return string SQL Select Statement
+     * @param  SugarBean $bean Sugarbean instance
+     * @return string SQL statement
      */
-	public function retrieveSQL(SugarBean $bean, array $where)
-	{
-		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		return "SELECT * FROM ".$bean->getTableName()." $where AND deleted=0";
-	}
+    public function dropTableSQL(SugarBean $bean)
+    {
+        return $this->dropTableNameSQL($bean->getTableName());
+    }
 
     /**
-     * This method implements a generic sql for a collection of beans.
+     * Generates SQL for dropping a table.
      *
-     * Currently, this function does not support outer joins.
+     * @param  string $name table name
+     * @return string SQL statement
+     */
+    public function dropTableNameSQL($name)
+    {
+        return "DROP TABLE ".$name;
+    }
+
+    /**
+     * Generates SQL for truncating a table.
+     * @param  string $name  table name
+     * @return string
+     */
+    public function truncateTableSQL($name)
+    {
+        return "TRUNCATE $name";
+    }
+
+    /**
+     * This method generates sql that deletes a column identified by fieldDef.
      *
-     * @param array $beans Array of values returned by get_class method as the keys and a bean as
-     *      the value for that key. These beans will be joined in the sql by the key
-     *      attribute of field defs.
-     * @param  array $cols Optional, columns to be returned with the keys as names of bean
-     *      as identified by get_class of bean. Values of this array is the array of fieldDefs
-     *      to be returned for a bean. If an empty array is passed, all columns are selected.
-     * @param  array $whereClause Optional, values with the keys as names of bean as identified
-     *      by get_class of bean. Each value at the first level is an array of values for that
-     *      bean identified by name of fields. If we want to pass multiple values for a name,
-     *      pass it as an array. If where is not passed, all the rows will be returned.
+     * @param  SugarBean $bean      Sugarbean instance
+     * @param  array  $fieldDefs
+     * @return string SQL statement
+     */
+    public function deleteColumnSQL(SugarBean $bean, $fieldDefs)
+    {
+        return $this->dropColumnSQL($bean->getTableName(), $fieldDefs);
+    }
+
+    /**
+     * This method generates sql that drops a column identified by fieldDef.
+     * Designed to work like the other addColumnSQL() and alterColumnSQL() functions
      *
-     * @return string SQL Select Statement
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @return string SQL statement
      */
-	public function retrieveViewSQL(array $beans, array $cols = array(), array $whereClause = array())
-	{
-		$relations = array(); // stores relations between tables as they are discovered
-		$where = $select = array();
-		foreach ($beans as $beanID => $bean) {
-			$tableName = $bean->getTableName();
-			$beanTables[$beanID] = $tableName;
-
-			$table = $beanID;
-			$tables[$table] = $tableName;
-			$aliases[$tableName][] = $table;
-
-			// build part of select for this table
-			if (is_array($cols[$beanID]))
-				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
-
-			// build part of where clause
-			if (is_array($whereClause[$beanID])){
-				$where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
-			}
-			// initialize so that it can be used properly in form clause generation
-			$table_used_in_from[$table] = false;
-
-			$indices = $bean->getIndices();
-			foreach ($indices as $index){
-				if ($index['type'] == 'foreign') {
-					$relationship[$table][] = array('foreignTable'=> $index['foreignTable']
-												,'foreignColumn'=>$index['foreignField']
-												,'localColumn'=> $index['fields']
-												);
-				}
-			}
-			$where[] = " $table.deleted = 0";
-		}
-
-		// join these clauses
-		$select = !empty($select) ? implode(",", $select) : "*";
-		$where = implode(" AND ", $where);
-
-		// generate the from clause. Use relations array to generate outer joins
-		// all the rest of the tables will be used as a simple from
-		// relations table define relations between table1 and table2 through column on table 1
-		// table2 is assumed to joining through primary key called id
-		$separator = "";
-		$from = ''; $table_used_in_from = array();
-		foreach ($relations as $table1 => $rightsidearray){
-			if ($table_used_in_from[$table1]) continue; // table has been joined
-
-			$from .= $separator." ".$table1;
-			$table_used_in_from[$table1] = true;
-			foreach ($rightsidearray as $tablearray){
-				$table2 = $tablearray['foreignTable']; // get foreign table
-				$tableAlias = $aliases[$table2]; // get a list of aliases for this table
-				foreach ($tableAlias as $table2) {
-					//choose first alias that does not match
-					// we are doing this because of self joins.
-					// in case of self joins, the same table will have many aliases.
-					if ($table2 != $table1) break;
-				}
-
-				$col = $tablearray['foreingColumn'];
-				$name = $tablearray['localColumn'];
-				$from .= " LEFT JOIN $table on ($table1.$name = $table2.$col)";
-				$table_used_in_from[$table2] = true;
-			}
-			$separator = ",";
-		}
-
-		return "SELECT $select FROM $from WHERE $where";
-	}
-
-	/**
-	 * Generates SQL for create index statement for a bean.
-	 *
-	 * @param  SugarBean $bean SugarBean instance
-	 * @param  array  $fields fields used in the index
-	 * @param  string $name index name
-	 * @param  bool   $unique Optional, set to true if this is an unique index
-	 * @return string SQL Select Statement
-	 */
-	public function createIndexSQL(SugarBean $bean, array $fields, $name, $unique = true)
-	{
-		$unique = ($unique) ? "unique" : "";
-		$tablename = $bean->getTableName();
-		$columns = array();
-		// get column names
-		foreach ($fields as $fieldDef)
-			$columns[] = $fieldDef['name'];
-
-		if (empty($columns))
-			return "";
-
-		$columns = implode(",", $columns);
-
-		return "CREATE $unique INDEX $name ON $tablename ($columns)";
-	}
-
-	/**
-	 * Returns the type of the variable in the field
-	 *
-	 * @param  array $fieldDef Vardef-format field def
-	 * @return string
-	 */
-	public function getFieldType($fieldDef)
-	{
-		// get the type for db type. if that is not set,
-		// get it from type. This is done so that
-		// we do not have change a lot of existing code
-		// and add dbtype where type is being used for some special
-		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
-			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
-			return  $fieldDef['dbtype'];
-		if (!empty($fieldDef['type']))
-			return  $fieldDef['type'];
-		if (!empty($fieldDef['Type']))
-			return  $fieldDef['Type'];
-		if (!empty($fieldDef['data_type']))
-			return  $fieldDef['data_type'];
-
-		return null;
-	}
+    public function dropColumnSQL($tablename, $fieldDefs)
+    {
+        return $this->changeColumnSQL($tablename, $fieldDefs, 'drop');
+    }
 
     /**
-     * retrieves the different components from the passed column type as it is used in the type mapping and vardefs
-     * type format: <baseType>[(<len>[,<scale>])]
-     * @param string $type Column type
-     * @return array|bool array containing the different components of the passed in type or false in case the type contains illegal characters
+     * Return a version of $proposed that can be used as a column name in any of our supported databases
+     * Practically this means no longer than 25 characters as the smallest identifier length for our supported DBs is 30 chars for Oracle plus we add on at least four characters in some places (for indicies for example)
+     * @param string|array $name Proposed name for the column
+     * @param bool|string $ensureUnique Ensure the name is unique
+     * @param string $type Name type (table, column)
+     * @param bool $force Force new name
+     * @return string|array Valid column name trimmed to right length and with invalid characters removed
      */
-    public function getTypeParts($type)
+    public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
     {
-        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
-        {
-            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
-            $return['baseType'] = $matches['type'];
-            if( isset($matches['arg'])) {
-                $return['arg'] = $matches['arg'];
+        if(is_array($name)) {
+            $result = array();
+            foreach($name as $field) {
+                $result[] = $this->getValidDBName($field, $ensureUnique, $type);
             }
-            if( isset($matches['len'])) {
-                $return['len'] = $matches['len'];
+            return $result;
+        } else {
+            if(strchr($name, ".")) {
+                // this is a compound name with dots, handle separately
+                $parts = explode(".", $name);
+                if(count($parts) > 2) {
+                    // some weird name, cut to table.name
+                    array_splice($parts, 0, count($parts)-2);
+                }
+                $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
+                return join(".", $parts);
             }
-            if( isset($matches['scale'])) {
-                $return['scale'] = $matches['scale'];
+            // first strip any invalid characters - all but word chars (which is alphanumeric and _)
+            $name = preg_replace( '/[^\w]+/i', '', $name ) ;
+            $len = strlen( $name ) ;
+            $maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
+            if ($len <= $maxLen && !$force) {
+                return strtolower($name);
+            }
+            if ($ensureUnique) {
+                $md5str = md5($name);
+                $tail = substr ( $name, -11) ;
+                $temp = substr($md5str , strlen($md5str)-4 );
+                $result = substr( $name, 0, 10) . $temp . $tail ;
+            } else {
+                $result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
             }
-            return $return;
-        } else {
-            return false;
-        }
-    }
-
-	/**
-	 * Returns the defintion for a single column
-	 *
-	 * @param  array  $fieldDef Vardef-format field def
-	 * @param  bool   $ignoreRequired  Optional, true if we should ignore this being a required field
-	 * @param  string $table           Optional, table name
-	 * @param  bool   $return_as_array Optional, true if we should return the result as an array instead of sql
-	 * @return string or array if $return_as_array is true
-	 */
-	protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
-	{
-		$name = $fieldDef['name'];
-		$type = $this->getFieldType($fieldDef);
-        $colType = $this->getColumnType($type);
 
-        if($parts = $this->getTypeParts($colType))
-        {
-            $colBaseType = $parts['baseType'];
-            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+            return strtolower( $result ) ;
         }
+    }
 
-        if(!empty($fieldDef['len'])) {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
-                                          'clob', 'blob', 'text'))) {
-          	    $colType = "$colBaseType(${fieldDef['len']})";
-            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
-                          $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-                      }
-                  else
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-              }
-        } else {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
-                $colType = "$colBaseType($defLen)";
-            }
-        }
+    /**
+     * Returns the valid type for a column given the type in fieldDef
+     *
+     * @param  string $type field type
+     * @return string valid type for the given field
+     */
+    public function getColumnType($type)
+    {
+        return isset($this->type_map[$type])?$this->type_map[$type]:$type;
+    }
 
-        $default = '';
+    /**
+     * Checks to see if passed array is truely an array of defitions
+     *
+     * Such an array may have type as a key but it will point to an array
+     * for a true array of definitions an to a col type for a definition only
+     *
+     * @param  mixed $defArray
+     * @return bool
+     */
+    public function isFieldArray($defArray)
+    {
+        if ( !is_array($defArray) )
+            return false;
 
-        // Bug #52610 We should have ability don't add DEFAULT part to query for boolean fields
-        if (!empty($fieldDef['no_default']))
-        {
-            // nothing to do
-        }
-        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
-        {
-            $default = " DEFAULT ".$this->quoted($fieldDef['default']);
-        }
-        elseif (!isset($default) && $type == 'bool')
-        {
-            $default = " DEFAULT 0 ";
+        if ( isset($defArray['type']) ){
+            // type key exists. May be an array of defs or a simple definition
+            return is_array($defArray['type']); // type is not an array => definition else array
         }
 
-		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
-
-		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
-		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
-		if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
-			(!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
-			$required =  "NOT NULL";
-		}
-		// If the field is marked both required & isnull=>false - alwqys make it not null
-		// Use this to ensure primary key fields never defined as null
-		if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
-			&& !empty($fieldDef['required'])) {
-			$required =  "NOT NULL";
-		}
-		if ($ignoreRequired)
-			$required = "";
-
-		if ( $return_as_array ) {
-			return array(
-				'name' => $name,
-				'colType' => $colType,
-                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
-				'default' => $default,
-				'required' => $required,
-				'auto_increment' => $auto_increment,
-				'full' => "$name $colType $default $required $auto_increment",
-				);
-		} else {
-			return "$name $colType $default $required $auto_increment";
-		}
-	}
-
-	/**
-	 * Returns SQL defintions for all columns in a table
-	 *
-	 * @param  array  $fieldDefs  Vardef-format field def
-	 * @param  bool   $ignoreRequired Optional, true if we should ignor this being a required field
-	 * @param  string $tablename      Optional, table name
-	 * @return string SQL column definitions
-	 */
-	protected function columnSQLRep($fieldDefs, $ignoreRequired = false, $tablename)
-	{
-		$columns = array();
-
-		if ($this->isFieldArray($fieldDefs)) {
-			foreach ($fieldDefs as $fieldDef) {
-				if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
-					$columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
-				}
-			}
-			$columns = implode(",", $columns);
-		}
-		else {
-			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
-		}
-
-		return $columns;
-	}
-
-	/**
-	 * Returns the next value for an auto increment
-	 * @abstract
-	 * @param  string $table Table name
-	 * @param  string $field_name Field name
-	 * @return string
-	 */
-	public function getAutoIncrement($table, $field_name)
-	{
-		return "";
-	}
-
-	/**
-	 * Returns the sql for the next value in a sequence
-	 * @abstract
-	 * @param  string $table  Table name
-	 * @param  string $field_name  Field name
-	 * @return string
-	 */
-	public function getAutoIncrementSQL($table, $field_name)
-	{
-		return "";
-	}
-
-	/**
-	 * Either creates an auto increment through queries or returns sql for auto increment
-	 * that can be appended to the end of column defination (mysql)
-	 * @abstract
-	 * @param  string $table Table name
-	 * @param  string $field_name Field name
-	 * @return string
-	 */
-	protected function setAutoIncrement($table, $field_name)
-	{
-		$this->deleteAutoIncrement($table, $field_name);
-		return "";
-	}
+        // type does not exist. Must be array of definitions
+        return true;
+    }
 
     /**
-     * Sets the next auto-increment value of a column to a specific value.
-     * @abstract
-     * @param  string $table Table name
-     * @param  string $field_name Field name
-     * @param  int $start_value  Starting autoincrement value
-     * @return string
+     * returns true if the type can be mapped to a valid column type
      *
+     * @param  string $type
+     * @return bool
      */
-	public function setAutoIncrementStart($table, $field_name, $start_value)
-	{
-		return "";
-	}
-
-	/**
-	 * Deletes an auto increment
-	 * @abstract
-	 * @param string $table tablename
-	 * @param string $field_name
-	 */
-	public function deleteAutoIncrement($table, $field_name)
-	{
-		return;
-	}
-
-	/**
-	 * This method generates sql for adding a column to table identified by field def.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function addColumnSQL($tablename, $fieldDefs)
-	{
-	    return $this->changeColumnSQL($tablename, $fieldDefs, 'add');
-	}
-
-	/**
-	 * This method genrates sql for altering old column identified by oldFieldDef to new fieldDef.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $newFieldDefs
-	 * @param  bool  $ignorerequired Optional, true if we should ignor this being a required field
-	 * @return string|array SQL statement(s)
-	 */
-	public function alterColumnSQL($tablename, $newFieldDefs, $ignorerequired = false)
-	{
-		return $this->changeColumnSQL($tablename, $newFieldDefs, 'modify', $ignorerequired);
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  SugarBean $bean Sugarbean instance
-	 * @return string SQL statement
-	 */
-	public function dropTableSQL(SugarBean $bean)
-	{
-		return $this->dropTableNameSQL($bean->getTableName());
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  string $name table name
-	 * @return string SQL statement
-	 */
-	public function dropTableNameSQL($name)
-	{
-		return "DROP TABLE ".$name;
-	}
-
-	/**
-	 * Generates SQL for truncating a table.
-	 * @param  string $name  table name
-	 * @return string
-	 */
-	public function truncateTableSQL($name)
-	{
-		return "TRUNCATE $name";
-	}
-
-	/**
-	 * This method generates sql that deletes a column identified by fieldDef.
-	 *
-	 * @param  SugarBean $bean      Sugarbean instance
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function deleteColumnSQL(SugarBean $bean, $fieldDefs)
-	{
-		return $this->dropColumnSQL($bean->getTableName(), $fieldDefs);
-	}
-
-	/**
-	 * This method generates sql that drops a column identified by fieldDef.
-	 * Designed to work like the other addColumnSQL() and alterColumnSQL() functions
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @return string SQL statement
-	 */
-	public function dropColumnSQL($tablename, $fieldDefs)
-	{
-		return $this->changeColumnSQL($tablename, $fieldDefs, 'drop');
-	}
+    protected function validColumnType($type)
+    {
+        $type = $this->getColumnType($type);
+        return !empty($type);
+    }
 
     /**
-     * Return a version of $proposed that can be used as a column name in any of our supported databases
-     * Practically this means no longer than 25 characters as the smallest identifier length for our supported DBs is 30 chars for Oracle plus we add on at least four characters in some places (for indicies for example)
-     * @param string|array $name Proposed name for the column
-     * @param bool|string $ensureUnique Ensure the name is unique
-     * @param string $type Name type (table, column)
-     * @param bool $force Force new name
-     * @return string|array Valid column name trimmed to right length and with invalid characters removed
-     */
-	public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
-	{
-		if(is_array($name)) {
-			$result = array();
-			foreach($name as $field) {
-				$result[] = $this->getValidDBName($field, $ensureUnique, $type);
-			}
-			return $result;
-		} else {
-		    if(strchr($name, ".")) {
-		        // this is a compound name with dots, handle separately
-		        $parts = explode(".", $name);
-		        if(count($parts) > 2) {
-		            // some weird name, cut to table.name
-		            array_splice($parts, 0, count($parts)-2);
-		        }
-		        $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
-                return join(".", $parts);
-		    }
-			// first strip any invalid characters - all but word chars (which is alphanumeric and _)
-			$name = preg_replace( '/[^\w]+/i', '', $name ) ;
-			$len = strlen( $name ) ;
-			$maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
-			if ($len <= $maxLen && !$force) {
-				return strtolower($name);
-			}
-			if ($ensureUnique) {
-				$md5str = md5($name);
-				$tail = substr ( $name, -11) ;
-				$temp = substr($md5str , strlen($md5str)-4 );
-				$result = substr( $name, 0, 10) . $temp . $tail ;
-			} else {
-				$result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
-			}
-
-			return strtolower( $result ) ;
-		}
-	}
-
-	/**
-	 * Returns the valid type for a column given the type in fieldDef
-	 *
-	 * @param  string $type field type
-	 * @return string valid type for the given field
-	 */
-	public function getColumnType($type)
-	{
-		return isset($this->type_map[$type])?$this->type_map[$type]:$type;
-	}
-
-	/**
-	 * Checks to see if passed array is truely an array of defitions
-	 *
-	 * Such an array may have type as a key but it will point to an array
-	 * for a true array of definitions an to a col type for a definition only
-	 *
-	 * @param  mixed $defArray
-	 * @return bool
-	 */
-	public function isFieldArray($defArray)
-	{
-		if ( !is_array($defArray) )
-			return false;
-
-		if ( isset($defArray['type']) ){
-			// type key exists. May be an array of defs or a simple definition
-			return is_array($defArray['type']); // type is not an array => definition else array
-		}
-
-		// type does not exist. Must be array of definitions
-		return true;
-	}
-
-	/**
-	 * returns true if the type can be mapped to a valid column type
-	 *
-	 * @param  string $type
-	 * @return bool
-	 */
-	protected function validColumnType($type)
-	{
-		$type = $this->getColumnType($type);
-		return !empty($type);
-	}
-
-	/**
-	 * Generate query for audit table
-	 * @param SugarBean $bean SugarBean that was changed
-	 * @param array $changes List of changes, contains 'before' and 'after'
+     * Generate query for audit table
+     * @param SugarBean $bean SugarBean that was changed
+     * @param array $changes List of changes, contains 'before' and 'after'
      * @return string  Audit table INSERT query
      */
-	protected function auditSQL(SugarBean $bean, $changes)
-	{
-		global $current_user;
-		$sql = "INSERT INTO ".$bean->get_audit_table_name();
-		//get field defs for the audit table.
-		require('metadata/audit_templateMetaData.php');
-		$fieldDefs = $dictionary['audit']['fields'];
-
-		$values=array();
-		$values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
-		$values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
-		$values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
-		$values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
-		if ($changes['data_type']=='text') {
-			$values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
-			$values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
-		} else {
-			$values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
-			$values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
-		}
-		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
-		$values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
-
-		$sql .= "(".implode(",", array_keys($values)).") ";
-		$sql .= "VALUES(".implode(",", $values).")";
-		return $sql;
-	}
+    protected function auditSQL(SugarBean $bean, $changes)
+    {
+        global $current_user;
+        $sql = "INSERT INTO ".$bean->get_audit_table_name();
+        //get field defs for the audit table.
+        require('metadata/audit_templateMetaData.php');
+        $fieldDefs = $dictionary['audit']['fields'];
+
+        $values=array();
+        $values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
+        $values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
+        $values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
+        $values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
+        if ($changes['data_type']=='text') {
+            $values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
+            $values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
+        } else {
+            $values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
+            $values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
+        }
+        $values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
+        $values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
+
+        $sql .= "(".implode(",", array_keys($values)).") ";
+        $sql .= "VALUES(".implode(",", $values).")";
+        return $sql;
+    }
 
     /**
      * Saves changes to module's audit table
@@ -2826,10 +2826,10 @@ 
      * @return bool query result
      *
      */
-	public function save_audit_records(SugarBean $bean, $changes)
-	{
-		return $this->query($this->auditSQL($bean, $changes));
-	}
+    public function save_audit_records(SugarBean $bean, $changes)
+    {
+        return $this->query($this->auditSQL($bean, $changes));
+    }
 
     /**
      * Finds fields whose value has changed.
@@ -2841,7 +2841,7 @@ 
      * @return array
      */
     public function getDataChanges(SugarBean &$bean, array $field_filter = null)
-	{
+    {
         $changed_values=array();
 
         $fetched_row = array();
@@ -2918,10 +2918,10 @@ 
                         }
                     }
                 }
-			}
-		}
-		return $changed_values;
-	}
+            }
+        }
+        return $changed_values;
+    }
 
     /**
      * Uses the audit enabled fields array to find fields whose value has changed.
@@ -2937,40 +2937,40 @@ 
         return $this->getDataChanges($bean, array_keys($audit_fields));
     }
 
-	/**
-	 * Setup FT indexing
-	 * @abstract
-	 */
-	public function full_text_indexing_setup()
-	{
-		// Most DBs have nothing to setup, so provide default empty function
-	}
-
-	/**
-	 * Quotes a string for storing in the database
-	 * @deprecated
-	 * Return value will be not surrounded by quotes
-	 *
-	 * @param  string $string
-	 * @return string
-	 */
-	public function escape_quote($string)
-	{
-		return $this->quote($string);
-	}
-
-	/**
-	 * Quotes a string for storing in the database
-	 * @deprecated
-	 * Return value will be not surrounded by quotes
-	 *
-	 * @param  string $string
-	 * @return string
-	 */
-	public function quoteFormEmail($string)
-	{
-		return $this->quote($string);
-	}
+    /**
+     * Setup FT indexing
+     * @abstract
+     */
+    public function full_text_indexing_setup()
+    {
+        // Most DBs have nothing to setup, so provide default empty function
+    }
+
+    /**
+     * Quotes a string for storing in the database
+     * @deprecated
+     * Return value will be not surrounded by quotes
+     *
+     * @param  string $string
+     * @return string
+     */
+    public function escape_quote($string)
+    {
+        return $this->quote($string);
+    }
+
+    /**
+     * Quotes a string for storing in the database
+     * @deprecated
+     * Return value will be not surrounded by quotes
+     *
+     * @param  string $string
+     * @return string
+     */
+    public function quoteFormEmail($string)
+    {
+        return $this->quote($string);
+    }
 
     /**
      * Renames an index using fields definition
@@ -2980,49 +2980,49 @@ 
      * @param  string $table_name
      * @return string SQL statement
      */
-	public function renameIndexDefs($old_definition, $new_definition, $table_name)
-	{
-		return array($this->add_drop_constraint($table_name,$old_definition,true),
-				$this->add_drop_constraint($table_name,$new_definition), false);
-	}
+    public function renameIndexDefs($old_definition, $new_definition, $table_name)
+    {
+        return array($this->add_drop_constraint($table_name,$old_definition,true),
+                $this->add_drop_constraint($table_name,$new_definition), false);
+    }
 
-	/**
-	 * Check if type is boolean
-	 * @param string $type
+    /**
+     * Check if type is boolean
+     * @param string $type
      * @return bool
      */
-	public function isBooleanType($type)
-	{
-		return 'bool' == $type;
-	}
+    public function isBooleanType($type)
+    {
+        return 'bool' == $type;
+    }
 
-	/**
-	 * Get truth value for boolean type
-	 * Allows 'off' to mean false, along with all 'empty' values
-	 * @param mixed $val
+    /**
+     * Get truth value for boolean type
+     * Allows 'off' to mean false, along with all 'empty' values
+     * @param mixed $val
      * @return bool
-	 */
-	protected function _getBooleanValue($val)
-	{
-		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
-			return false;
-
-		return true;
-	}
-
-	/**
-	 * Check if type is a number
-	 * @param string $type
+     */
+    protected function _getBooleanValue($val)
+    {
+        //need to put the === sign here otherwise true == 'non empty string'
+        if (empty($val) or $val==='off')
+            return false;
+
+        return true;
+    }
+
+    /**
+     * Check if type is a number
+     * @param string $type
      * @return bool
-	 */
-	public function isNumericType($type)
-	{
-	    if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
-	        return true;
-	    }
-		return false;
-	}
+     */
+    public function isNumericType($type)
+    {
+        if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+            return true;
+        }
+        return false;
+    }
 
     /**
      * Check if the value is empty value for this type
@@ -3030,272 +3030,272 @@ 
      * @param string $type Type (one of vardef types)
      * @return bool true if the value if empty
      */
-	protected function _emptyValue($val, $type)
-	{
-		if (empty($val))
-			return true;
-
-		if($this->emptyValue($type) == $val) {
-			return true;
-		}
-		switch ($type) {
-			case 'decimal':
-			case 'decimal2':
-			case 'int':
-			case 'double':
-			case 'float':
-			case 'uint':
-			case 'ulong':
-			case 'long':
-			case 'short':
-				return ($val == 0);
-			case 'date':
-				if ($val == '0000-00-00')
-					return true;
-				if ($val == 'NULL')
-					return true;
-				return false;
-		}
-
-		return false;
-	}
-
-	/**
+    protected function _emptyValue($val, $type)
+    {
+        if (empty($val))
+            return true;
+
+        if($this->emptyValue($type) == $val) {
+            return true;
+        }
+        switch ($type) {
+            case 'decimal':
+            case 'decimal2':
+            case 'int':
+            case 'double':
+            case 'float':
+            case 'uint':
+            case 'ulong':
+            case 'long':
+            case 'short':
+                return ($val == 0);
+            case 'date':
+                if ($val == '0000-00-00')
+                    return true;
+                if ($val == 'NULL')
+                    return true;
+                return false;
+        }
+
+        return false;
+    }
+
+    /**
      * @abstract
-	 * Does this type represent text (i.e., non-varchar) value?
-	 * @param string $type
+     * Does this type represent text (i.e., non-varchar) value?
+     * @param string $type
      * @return bool
-	 */
-	public function isTextType($type)
-	{
-		return false;
-	}
-
-	/**
-	 * Check if this DB supports certain capability
-	 * See $this->capabilities for the list
-	 * @param string $cap
+     */
+    public function isTextType($type)
+    {
+        return false;
+    }
+
+    /**
+     * Check if this DB supports certain capability
+     * See $this->capabilities for the list
+     * @param string $cap
      * @return bool
-	 */
-	public function supports($cap)
-	{
-		return !empty($this->capabilities[$cap]);
-	}
-
-	/**
-	 * Create ORDER BY clause for ENUM type field
-	 * @param string $order_by Field name
-	 * @param array $values Possible enum value
-	 * @param string $order_dir Order direction, ASC or DESC
+     */
+    public function supports($cap)
+    {
+        return !empty($this->capabilities[$cap]);
+    }
+
+    /**
+     * Create ORDER BY clause for ENUM type field
+     * @param string $order_by Field name
+     * @param array $values Possible enum value
+     * @param string $order_dir Order direction, ASC or DESC
      * @return string
      */
-	public function orderByEnum($order_by, $values, $order_dir)
-	{
-		$i = 0;
-		$order_by_arr = array();
-		foreach ($values as $key => $value) {
-			if($key == '') {
-				$order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
-			} else {
-				$order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
-			}
-			$i++;
-		}
-		return "CASE ".implode("\n", $order_by_arr)." ELSE $i END $order_dir\n";
-	}
-
-	/**
-	 * Return representation of an empty value depending on type
-	 * The value is fully quoted, converted, etc.
-	 * @param string $type
+    public function orderByEnum($order_by, $values, $order_dir)
+    {
+        $i = 0;
+        $order_by_arr = array();
+        foreach ($values as $key => $value) {
+            if($key == '') {
+                $order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
+            } else {
+                $order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
+            }
+            $i++;
+        }
+        return "CASE ".implode("\n", $order_by_arr)." ELSE $i END $order_dir\n";
+    }
+
+    /**
+     * Return representation of an empty value depending on type
+     * The value is fully quoted, converted, etc.
+     * @param string $type
      * @return mixed Empty value
      */
-	public function emptyValue($type)
-	{
-		if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
-			return 0;
-		}
+    public function emptyValue($type)
+    {
+        if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+            return 0;
+        }
 
-		return "''";
-	}
+        return "''";
+    }
 
-	/**
-	 * List of available collation settings
+    /**
+     * List of available collation settings
      * @abstract
-	 * @return string
-	 */
-	public function getDefaultCollation()
-	{
-		return null;
-	}
-
-	/**
-	 * List of available collation settings
+     * @return string
+     */
+    public function getDefaultCollation()
+    {
+        return null;
+    }
+
+    /**
+     * List of available collation settings
      * @abstract
-	 * @return array
-	 */
-	public function getCollationList()
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the number of columns in a table
-	 *
-	 * @param  string $table_name
-	 * @return int
-	 */
-	public function number_of_columns($table_name)
-	{
-		$table = $this->getTableDescription($table_name);
-		return count($table);
-	}
-
-	/**
-	 * Return limit query based on given query
-	 * @param string $sql
-	 * @param int $start
-	 * @param int $count
-	 * @param bool $dieOnError
-	 * @param string $msg
+     * @return array
+     */
+    public function getCollationList()
+    {
+        return null;
+    }
+
+    /**
+     * Returns the number of columns in a table
+     *
+     * @param  string $table_name
+     * @return int
+     */
+    public function number_of_columns($table_name)
+    {
+        $table = $this->getTableDescription($table_name);
+        return count($table);
+    }
+
+    /**
+     * Return limit query based on given query
+     * @param string $sql
+     * @param int $start
+     * @param int $count
+     * @param bool $dieOnError
+     * @param string $msg
      * @return resource|bool query result
      * @see DBManager::limitQuery()
-	 */
-	public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
-	{
-		return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
-	}
-
-	/**
-	 * Return current time in format fit for insertion into DB (with quotes)
-	 * @return string
-	 */
-	public function now()
-	{
-		return $this->convert($this->quoted(TimeDate::getInstance()->nowDb()), "datetime");
-	}
-
-	/**
-	 * Check if connecting user has certain privilege
-	 * @param string $privilege
+     */
+    public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
+    {
+        return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
+    }
+
+    /**
+     * Return current time in format fit for insertion into DB (with quotes)
+     * @return string
+     */
+    public function now()
+    {
+        return $this->convert($this->quoted(TimeDate::getInstance()->nowDb()), "datetime");
+    }
+
+    /**
+     * Check if connecting user has certain privilege
+     * @param string $privilege
      * @return bool Privilege allowed?
      */
-	public function checkPrivilege($privilege)
-	{
-		switch($privilege) {
-			case "CREATE TABLE":
-				$this->query("CREATE TABLE temp (id varchar(36))");
-				break;
-			case "DROP TABLE":
-				$sql = $this->dropTableNameSQL("temp");
-				$this->query($sql);
-				break;
-			case "INSERT":
-				$this->query("INSERT INTO temp (id) VALUES ('abcdef0123456789abcdef0123456789abcd')");
-				break;
-			case "UPDATE":
-				$this->query("UPDATE temp SET id = '100000000000000000000000000000000000' WHERE id = 'abcdef0123456789abcdef0123456789abcd'");
-				break;
-			case 'SELECT':
-				return $this->getOne('SELECT id FROM temp WHERE id=\'100000000000000000000000000000000000\'', false);
-			case 'DELETE':
-				$this->query("DELETE FROM temp WHERE id = '100000000000000000000000000000000000'");
-				break;
-			case "ADD COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
-				$sql = 	$this->changeColumnSQL("temp", $test, "add");
-				$this->query($sql);
-				break;
-			case "CHANGE COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "modify");
-				$this->query($sql);
-				break;
-			case "DROP COLUMN":
-				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "drop");
-				$this->query($sql);
-				break;
-			default:
-				return false;
-		}
-		if($this->checkError("Checking privileges")) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if the query is a select query
-	 * @param string $query
+    public function checkPrivilege($privilege)
+    {
+        switch($privilege) {
+            case "CREATE TABLE":
+                $this->query("CREATE TABLE temp (id varchar(36))");
+                break;
+            case "DROP TABLE":
+                $sql = $this->dropTableNameSQL("temp");
+                $this->query($sql);
+                break;
+            case "INSERT":
+                $this->query("INSERT INTO temp (id) VALUES ('abcdef0123456789abcdef0123456789abcd')");
+                break;
+            case "UPDATE":
+                $this->query("UPDATE temp SET id = '100000000000000000000000000000000000' WHERE id = 'abcdef0123456789abcdef0123456789abcd'");
+                break;
+            case 'SELECT':
+                return $this->getOne('SELECT id FROM temp WHERE id=\'100000000000000000000000000000000000\'', false);
+            case 'DELETE':
+                $this->query("DELETE FROM temp WHERE id = '100000000000000000000000000000000000'");
+                break;
+            case "ADD COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
+                $sql = 	$this->changeColumnSQL("temp", $test, "add");
+                $this->query($sql);
+                break;
+            case "CHANGE COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
+                $sql = 	$this->changeColumnSQL("temp", $test, "modify");
+                $this->query($sql);
+                break;
+            case "DROP COLUMN":
+                $test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
+                $sql = 	$this->changeColumnSQL("temp", $test, "drop");
+                $this->query($sql);
+                break;
+            default:
+                return false;
+        }
+        if($this->checkError("Checking privileges")) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Check if the query is a select query
+     * @param string $query
      * @return bool  Is query SELECT?
      */
-	protected function isSelect($query)
-	{
-		$query = trim($query);
-		$select_check = strpos(strtolower($query), strtolower("SELECT"));
-		//Checks to see if there is union select which is valid
-		$select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
-		if($select_check==0 || $select_check2==0){
-			//Returning false means query is ok!
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Parse fulltext search query with mysql syntax:
-	 *  terms quoted by ""
-	 *  + means the term must be included
-	 *  - means the term must be excluded
-	 *  * or % at the end means wildcard
-	 * @param string $query
-	 * @return array of 3 elements - query terms, mandatory terms and excluded terms
-	 */
-	public function parseFulltextQuery($query)
-	{
-		/* split on space or comma, double quotes with \ for escape */
-		if(strpbrk($query, " ,")) {
-			// ("([^"]*?)"|[^" ,]+)((, )+)?
-			// '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
-			if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
-				return false;
-			}
-			$qterms = $m[1];
-		} else {
-			$qterms = array($query);
-		}
-		$terms = $must_terms = $not_terms = array();
-		foreach($qterms as $item) {
-			if($item[0] == '"') {
-				$item = trim($item, '"');
-			}
-			if($item[0] == '+') {
+    protected function isSelect($query)
+    {
+        $query = trim($query);
+        $select_check = strpos(strtolower($query), strtolower("SELECT"));
+        //Checks to see if there is union select which is valid
+        $select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
+        if($select_check==0 || $select_check2==0){
+            //Returning false means query is ok!
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Parse fulltext search query with mysql syntax:
+     *  terms quoted by ""
+     *  + means the term must be included
+     *  - means the term must be excluded
+     *  * or % at the end means wildcard
+     * @param string $query
+     * @return array of 3 elements - query terms, mandatory terms and excluded terms
+     */
+    public function parseFulltextQuery($query)
+    {
+        /* split on space or comma, double quotes with \ for escape */
+        if(strpbrk($query, " ,")) {
+            // ("([^"]*?)"|[^" ,]+)((, )+)?
+            // '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
+            if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
+                return false;
+            }
+            $qterms = $m[1];
+        } else {
+            $qterms = array($query);
+        }
+        $terms = $must_terms = $not_terms = array();
+        foreach($qterms as $item) {
+            if($item[0] == '"') {
+                $item = trim($item, '"');
+            }
+            if($item[0] == '+') {
                 if (strlen($item) > 1) {
                     $must_terms[] = substr($item, 1);
                 }
                 continue;
-			}
-			if($item[0] == '-') {
+            }
+            if($item[0] == '-') {
                 if (strlen($item) > 1) {
-				    $not_terms[] = substr($item, 1);
+                    $not_terms[] = substr($item, 1);
                 }
                 continue;
-			}
-			$terms[] = $item;
-		}
-		return array($terms, $must_terms, $not_terms);
-	}
+            }
+            $terms[] = $item;
+        }
+        return array($terms, $must_terms, $not_terms);
+    }
 
     // Methods to check respective queries
-	protected $standardQueries = array(
-		'ALTER TABLE' => 'verifyAlterTable',
-		'DROP TABLE' => 'verifyDropTable',
-		'CREATE TABLE' => 'verifyCreateTable',
-		'INSERT INTO' => 'verifyInsertInto',
-		'UPDATE' => 'verifyUpdate',
-		'DELETE FROM' => 'verifyDeleteFrom',
-	);
+    protected $standardQueries = array(
+        'ALTER TABLE' => 'verifyAlterTable',
+        'DROP TABLE' => 'verifyDropTable',
+        'CREATE TABLE' => 'verifyCreateTable',
+        'INSERT INTO' => 'verifyInsertInto',
+        'UPDATE' => 'verifyUpdate',
+        'DELETE FROM' => 'verifyDeleteFrom',
+    );
 
 
     /**
@@ -3303,8 +3303,8 @@ 
      * @param string $query SQL query
      * @return string
      */
-	protected function extractTableName($query)
-	{
+    protected function extractTableName($query)
+    {
         $query = preg_replace('/[^A-Za-z0-9_\s]/', "", $query);
         $query = trim(str_replace(array_keys($this->standardQueries), '', $query));
 
@@ -3313,7 +3313,7 @@ 
         $table = substr($query, 0, $end);
 
         return $table;
-	}
+    }
 
     /**
      * Verify SQl statement using per-DB verification function
@@ -3322,284 +3322,284 @@ 
      * @param array $skipTables List of blacklisted tables that aren't checked
      * @return string
      */
-	public function verifySQLStatement($query, $skipTables)
-	{
-		$query = trim($query);
-		foreach($this->standardQueries as $qstart => $check) {
-			if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
-				if(is_callable(array($this, $check))) {
-					$table = $this->extractTableName($query);
-					if(!in_array($table, $skipTables)) {
-						return call_user_func(array($this, $check), $table, $query);
-					} else {
-						$this->log->debug("Skipping table $table as blacklisted");
-					}
-				} else {
-					$this->log->debug("No verification for $qstart on {$this->dbType}");
-				}
-				break;
-			}
-		}
-		return "";
-	}
-
-	/**
-	 * Tests an CREATE TABLE query
-	 * @param string $table The table name to get DDL
-	 * @param string $query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	protected function verifyCreateTable($table, $query)
-	{
-		$this->log->debug('verifying CREATE statement...');
-
-		// rewrite DDL with _temp name
-		$this->log->debug('testing query: ['.$query.']');
-		$tempname = $table."__uw_temp";
-		$tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
-
-		if(strpos($tempTableQuery, '__uw_temp') === false) {
-			return 'Could not use a temp table to test query!';
-		}
-
-		$this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
-
-		$error = $this->lastError(); // empty on no-errors
-		if(!empty($error)) {
-			return $error;
-		}
-
-		// check if table exists
-		$this->log->debug('testing for table: '.$table);
-		if(!$this->tableExists($tempname)) {
-			return "Failed to create temp table!";
-		}
-
-		$this->dropTableName($tempname);
-		return '';
-	}
-
-	/**
-	 * Execute multiple queries one after another
-	 * @param array $sqls Queries
-	 * @param bool $dieOnError Die on error, passed to query()
-	 * @param string $msg Error message, passed to query()
-	 * @param bool $suppress Supress errors, passed to query()
-	 * @return resource|bool result set or success/failure bool
-	 */
-	public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		$last = true;
-		foreach($sqls as $sql) {
-			if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
-				break;
-			}
-		}
-		return $last;
-	}
-
-	/**
-	 * Fetches the next row in the query result into an associative array
-	 *
-	 * @param  resource $result
-	 * @param  bool $encode Need to HTML-encode the result?
-	 * @return array    returns false if there are no more rows available to fetch
-	 */
-	public function fetchByAssoc($result, $encode = true)
-	{
-	    if (empty($result))	return false;
-
-	    if(is_int($encode) && func_num_args() == 3) {
-	        // old API: $result, $rowNum, $encode
-	        $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
-	        $encode = func_get_arg(2);
-	    }
-	    $row = $this->fetchRow($result);
-	    if (!empty($row) && $encode && $this->encode) {
-	    	return array_map('to_html', $row);
-	    } else {
-	       return $row;
-	    }
-	}
-
-	/**
-	 * Get DB driver name used for install/upgrade scripts
-	 * @return string
-	 */
-	public function getScriptName()
-	{
-		// Usually the same name as dbType
-		return $this->dbType;
-	}
-
-	/**
-	 * Set database options
-	 * Options are usually db-dependant and derive from $config['dbconfigoption']
-	 * @param array $options
-	 * @return DBManager
-	 */
-	public function setOptions($options)
-	{
-	    $this->options = $options;
-	    return $this;
-	}
-
-	/**
-	 * Get DB options
-	 * @return array
-	 */
-	public function getOptions()
-	{
-	    return $this->options;
-	}
-
-	/**
-	 * Get DB option by name
-	 * @param string $option Option name
-	 * @return mixed Option value or null if doesn't exist
-	 */
-	public function getOption($option)
-	{
-	    if(isset($this->options[$option])) {
-	        return $this->options[$option];
-	    }
-	    return null;
-	}
-
-	/**
-	 * Commits pending changes to the database when the driver is setup to support transactions.
-	 * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
-	 * @abstract
-	 * @return bool true if commit succeeded, false if it failed
-	 */
-	public function commit()
-	{
-		$this->log->info("DBManager.commit() stub");
-		return true;
-	}
-
-	/**
-	 * Rollsback pending changes to the database when the driver is setup to support transactions.
-	 * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
-	 * Since rollbacks cannot be done, this implementation always returns false.
-	 * @abstract
-	 * @return bool true if rollback succeeded, false if it failed
-	 */
-	public function rollback()
-	{
-		$this->log->info("DBManager.rollback() stub");
-		return false;
-	}
-
-	/**
-	 * Check if this DB name is valid
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function isDatabaseNameValid($name)
-	{
-		// Generic case - no slashes, no dots
-		return preg_match('#[/.\\\\]#', $name)==0;
-	}
-
-	/**
-	 * Check special requirements for DB installation.
-	 * @abstract
-	 * If everything is OK, return true.
-	 * If something's wrong, return array of error code and parameters
-	 * @return mixed
-	 */
-	public function canInstall()
-	{
-		return true;
-	}
-
-	/**
-	 * @abstract
+    public function verifySQLStatement($query, $skipTables)
+    {
+        $query = trim($query);
+        foreach($this->standardQueries as $qstart => $check) {
+            if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
+                if(is_callable(array($this, $check))) {
+                    $table = $this->extractTableName($query);
+                    if(!in_array($table, $skipTables)) {
+                        return call_user_func(array($this, $check), $table, $query);
+                    } else {
+                        $this->log->debug("Skipping table $table as blacklisted");
+                    }
+                } else {
+                    $this->log->debug("No verification for $qstart on {$this->dbType}");
+                }
+                break;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Tests an CREATE TABLE query
+     * @param string $table The table name to get DDL
+     * @param string $query The query to test.
+     * @return string Non-empty if error found
+     */
+    protected function verifyCreateTable($table, $query)
+    {
+        $this->log->debug('verifying CREATE statement...');
+
+        // rewrite DDL with _temp name
+        $this->log->debug('testing query: ['.$query.']');
+        $tempname = $table."__uw_temp";
+        $tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
+
+        if(strpos($tempTableQuery, '__uw_temp') === false) {
+            return 'Could not use a temp table to test query!';
+        }
+
+        $this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
+
+        $error = $this->lastError(); // empty on no-errors
+        if(!empty($error)) {
+            return $error;
+        }
+
+        // check if table exists
+        $this->log->debug('testing for table: '.$table);
+        if(!$this->tableExists($tempname)) {
+            return "Failed to create temp table!";
+        }
+
+        $this->dropTableName($tempname);
+        return '';
+    }
+
+    /**
+     * Execute multiple queries one after another
+     * @param array $sqls Queries
+     * @param bool $dieOnError Die on error, passed to query()
+     * @param string $msg Error message, passed to query()
+     * @param bool $suppress Supress errors, passed to query()
+     * @return resource|bool result set or success/failure bool
+     */
+    public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        $last = true;
+        foreach($sqls as $sql) {
+            if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
+                break;
+            }
+        }
+        return $last;
+    }
+
+    /**
+     * Fetches the next row in the query result into an associative array
+     *
+     * @param  resource $result
+     * @param  bool $encode Need to HTML-encode the result?
+     * @return array    returns false if there are no more rows available to fetch
+     */
+    public function fetchByAssoc($result, $encode = true)
+    {
+        if (empty($result))	return false;
+
+        if(is_int($encode) && func_num_args() == 3) {
+            // old API: $result, $rowNum, $encode
+            $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
+            $encode = func_get_arg(2);
+        }
+        $row = $this->fetchRow($result);
+        if (!empty($row) && $encode && $this->encode) {
+            return array_map('to_html', $row);
+        } else {
+            return $row;
+        }
+    }
+
+    /**
+     * Get DB driver name used for install/upgrade scripts
+     * @return string
+     */
+    public function getScriptName()
+    {
+        // Usually the same name as dbType
+        return $this->dbType;
+    }
+
+    /**
+     * Set database options
+     * Options are usually db-dependant and derive from $config['dbconfigoption']
+     * @param array $options
+     * @return DBManager
+     */
+    public function setOptions($options)
+    {
+        $this->options = $options;
+        return $this;
+    }
+
+    /**
+     * Get DB options
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Get DB option by name
+     * @param string $option Option name
+     * @return mixed Option value or null if doesn't exist
+     */
+    public function getOption($option)
+    {
+        if(isset($this->options[$option])) {
+            return $this->options[$option];
+        }
+        return null;
+    }
+
+    /**
+     * Commits pending changes to the database when the driver is setup to support transactions.
+     * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
+     * @abstract
+     * @return bool true if commit succeeded, false if it failed
+     */
+    public function commit()
+    {
+        $this->log->info("DBManager.commit() stub");
+        return true;
+    }
+
+    /**
+     * Rollsback pending changes to the database when the driver is setup to support transactions.
+     * Note that the default implementation is applicable for transaction-less or auto commit scenarios.
+     * Since rollbacks cannot be done, this implementation always returns false.
+     * @abstract
+     * @return bool true if rollback succeeded, false if it failed
+     */
+    public function rollback()
+    {
+        $this->log->info("DBManager.rollback() stub");
+        return false;
+    }
+
+    /**
+     * Check if this DB name is valid
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function isDatabaseNameValid($name)
+    {
+        // Generic case - no slashes, no dots
+        return preg_match('#[/.\\\\]#', $name)==0;
+    }
+
+    /**
+     * Check special requirements for DB installation.
+     * @abstract
+     * If everything is OK, return true.
+     * If something's wrong, return array of error code and parameters
+     * @return mixed
+     */
+    public function canInstall()
+    {
+        return true;
+    }
+
+    /**
+     * @abstract
      * Code run on new database before installing
-	 */
-	public function preInstall()
-	{
-	}
+     */
+    public function preInstall()
+    {
+    }
+
+    /**
+     * @abstract
+     * Code run on new database after installing
+     */
+    public function postInstall()
+    {
+    }
+
+    /**
+     * Disable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function disableKeys($tableName)
+    {
+    }
 
-	/**
+    /**
+     * Re-enable keys on the table
      * @abstract
-	 * Code run on new database after installing
-	 */
-	public function postInstall()
-	{
-	}
-
-	/**
-	 * Disable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function disableKeys($tableName)
-	{
-	}
-
-	/**
-	 * Re-enable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function enableKeys($tableName)
-	{
-	}
-
-	/**
-	 * Quote string in DB-specific manner
-	 * @param string $string
-	 * @return string
-	 */
-	abstract public function quote($string);
+     * @param string $tableName
+     */
+    public function enableKeys($tableName)
+    {
+    }
+
+    /**
+     * Quote string in DB-specific manner
+     * @param string $string
+     * @return string
+     */
+    abstract public function quote($string);
 
     abstract public function quoteIdentifier($string);
 
-	/**
-	 * Use when you need to convert a database string to a different value; this function does it in a
-	 * database-backend aware way
-	 * Supported conversions:
-	 *      today		return current date
-	 *      left		Take substring from the left
-	 *      date_format	Format date as string, supports %Y-%m-%d, %Y-%m, %Y
+    /**
+     * Use when you need to convert a database string to a different value; this function does it in a
+     * database-backend aware way
+     * Supported conversions:
+     *      today		return current date
+     *      left		Take substring from the left
+     *      date_format	Format date as string, supports %Y-%m-%d, %Y-%m, %Y
      *      time_format Format time as string
      *      date        Convert date string to datetime value
      *      time        Convert time string to datetime value
-	 *      datetime	Convert datetime string to datetime value
-	 *      ifnull		If var is null, use default value
-	 *      concat		Concatenate strings
-	 *      quarter		Quarter number of the date
-	 *      length		Length of string
-	 *      month		Month number of the date
-	 *      add_date	Add specified interval to a date
+     *      datetime	Convert datetime string to datetime value
+     *      ifnull		If var is null, use default value
+     *      concat		Concatenate strings
+     *      quarter		Quarter number of the date
+     *      length		Length of string
+     *      month		Month number of the date
+     *      add_date	Add specified interval to a date
      *      add_time    Add time interval to a date
      *      text2char   Convert text field to varchar
-	 *
-	 * @param string $string database string to convert
-	 * @param string $type type of conversion to do
-	 * @param array  $additional_parameters optional, additional parameters to pass to the db function
-	 * @return string
-	 */
-	abstract public function convert($string, $type, array $additional_parameters = array());
-
-	/**
-	 * Converts from Database data to app data
-	 *
-	 * Supported types
-	 * - date
-	 * - time
-	 * - datetime
+     *
+     * @param string $string database string to convert
+     * @param string $type type of conversion to do
+     * @param array  $additional_parameters optional, additional parameters to pass to the db function
+     * @return string
+     */
+    abstract public function convert($string, $type, array $additional_parameters = array());
+
+    /**
+     * Converts from Database data to app data
+     *
+     * Supported types
+     * - date
+     * - time
+     * - datetime
      * - datetimecombo
      * - timestamp
-	 *
-	 * @param string $string database string to convert
-	 * @param string $type type of conversion to do
-	 * @return string
-	 */
-	abstract public function fromConvert($string, $type);
+     *
+     * @param string $string database string to convert
+     * @param string $type type of conversion to do
+     * @return string
+     */
+    abstract public function fromConvert($string, $type);
 
     /**
      * Parses and runs queries
@@ -3611,7 +3611,7 @@ 
      * @param  bool     $keepResult Keep query result in the object?
      * @return resource|bool result set or success/failure bool
      */
-	abstract public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false);
+    abstract public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false);
 
     /**
      * Runs a limit query: one where we specify where to start getting records and how many to get
@@ -3624,173 +3624,173 @@ 
      * @param  bool     $execute Execute or return SQL?
      * @return resource query result
      */
-	abstract function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true);
-
-
-	/**
-	 * Free Database result
-	 * @param resource $dbResult
-	 */
-	abstract protected function freeDbResult($dbResult);
-
-	/**
-	 * Rename column in the DB
-	 * @param string $tablename
-	 * @param string $column
-	 * @param string $newname
-	 */
-	abstract function renameColumnSQL($tablename, $column, $newname);
-
-	/**
-	 * Returns definitions of all indies for passed table.
-	 *
-	 * return will is a multi-dimensional array that
-	 * categorizes the index definition by types, unique, primary and index.
-	 * <code>
-	 * <?php
-	 * array(                                                              O
-	 *       'index1'=> array (
-	 *           'name'   => 'index1',
-	 *           'type'   => 'primary',
-	 *           'fields' => array('field1','field2')
-	 *           )
-	 *       )
-	 * ?>
-	 * </code>
-	 * This format is similar to how indicies are defined in vardef file.
-	 *
-	 * @param  string $tablename
-	 * @return array
-	 */
-	abstract public function get_indices($tablename);
-
-	/**
-	 * Returns definitions of all indies for passed table.
-	 *
-	 * return will is a multi-dimensional array that
-	 * categorizes the index definition by types, unique, primary and index.
-	 * <code>
-	 * <?php
-	 * array(
-	 *       'field1'=> array (
-	 *           'name'   => 'field1',
-	 *           'type'   => 'varchar',
-	 *           'len' => '200'
-	 *           )
-	 *       )
-	 * ?>
-	 * </code>
-	 * This format is similar to how indicies are defined in vardef file.
-	 *
-	 * @param  string $tablename
-	 * @return array
-	 */
-	abstract public function get_columns($tablename);
-
-	/**
-	 * Generates alter constraint statement given a table name and vardef definition.
-	 *
-	 * Supports both adding and droping a constraint.
-	 *
-	 * @param  string $table      tablename
-	 * @param  array  $definition field definition
-	 * @param  bool   $drop       true if we are dropping the constraint, false if we are adding it
-	 * @return string SQL statement
-	 */
-	abstract public function add_drop_constraint($table, $definition, $drop = false);
-
-	/**
-	 * Returns the description of fields based on the result
-	 *
-	 * @param  resource $result
-	 * @param  boolean  $make_lower_case
-	 * @return array field array
-	 */
-	abstract public function getFieldsArray($result, $make_lower_case = false);
-
-	/**
-	 * Returns an array of tables for this database
-	 *
-	 * @return	array|false 	an array of with table names, false if no tables found
-	 */
-	abstract public function getTablesArray();
-
-	/**
-	 * Return's the version of the database
-	 *
-	 * @return string
-	 */
-	abstract public function version();
-
-	/**
-	 * Checks if a table with the name $tableName exists
-	 * and returns true if it does or false otherwise
-	 *
-	 * @param  string $tableName
-	 * @return bool
-	 */
-	abstract public function tableExists($tableName);
-
-	/**
-	 * Fetches the next row in the query result into an associative array
-	 *
-	 * @param  resource $result
-	 * @return array    returns false if there are no more rows available to fetch
-	 */
-	abstract public function fetchRow($result);
-
-	/**
-	 * Connects to the database backend
-	 *
-	 * Takes in the database settings and opens a database connection based on those
-	 * will open either a persistent or non-persistent connection.
-	 * If a persistent connection is desired but not available it will defualt to non-persistent
-	 *
-	 * configOptions must include
-	 * db_host_name - server ip
-	 * db_user_name - database user name
-	 * db_password - database password
-	 *
-	 * @param array   $configOptions
-	 * @param boolean $dieOnError
-	 */
-	abstract public function connect(array $configOptions = null, $dieOnError = false);
-
-	/**
-	 * Generates sql for create table statement for a bean.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @param  array  $indices
-	 * @return string SQL Create Table statement
-	 */
-	abstract public function createTableSQLParams($tablename, $fieldDefs, $indices);
-
-	/**
-	 * Generates the SQL for changing columns
-	 *
-	 * @param string $tablename
-	 * @param array  $fieldDefs
-	 * @param string $action
-	 * @param bool   $ignoreRequired Optional, true if we should ignor this being a required field
-	 * @return string|array
-	 */
-	abstract protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false);
-
-	/**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	abstract public function disconnect();
-
-	/**
-	 * Get last database error
-	 * This function should return last error as reported by DB driver
-	 * and should return false if no error condition happened
-	 * @return string|false Error message or false if no error happened
-	 */
-	abstract public function lastDbError();
+    abstract function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true);
+
+
+    /**
+     * Free Database result
+     * @param resource $dbResult
+     */
+    abstract protected function freeDbResult($dbResult);
+
+    /**
+     * Rename column in the DB
+     * @param string $tablename
+     * @param string $column
+     * @param string $newname
+     */
+    abstract function renameColumnSQL($tablename, $column, $newname);
+
+    /**
+     * Returns definitions of all indies for passed table.
+     *
+     * return will is a multi-dimensional array that
+     * categorizes the index definition by types, unique, primary and index.
+     * <code>
+     * <?php
+     * array(                                                              O
+     *       'index1'=> array (
+     *           'name'   => 'index1',
+     *           'type'   => 'primary',
+     *           'fields' => array('field1','field2')
+     *           )
+     *       )
+     * ?>
+     * </code>
+     * This format is similar to how indicies are defined in vardef file.
+     *
+     * @param  string $tablename
+     * @return array
+     */
+    abstract public function get_indices($tablename);
+
+    /**
+     * Returns definitions of all indies for passed table.
+     *
+     * return will is a multi-dimensional array that
+     * categorizes the index definition by types, unique, primary and index.
+     * <code>
+     * <?php
+     * array(
+     *       'field1'=> array (
+     *           'name'   => 'field1',
+     *           'type'   => 'varchar',
+     *           'len' => '200'
+     *           )
+     *       )
+     * ?>
+     * </code>
+     * This format is similar to how indicies are defined in vardef file.
+     *
+     * @param  string $tablename
+     * @return array
+     */
+    abstract public function get_columns($tablename);
+
+    /**
+     * Generates alter constraint statement given a table name and vardef definition.
+     *
+     * Supports both adding and droping a constraint.
+     *
+     * @param  string $table      tablename
+     * @param  array  $definition field definition
+     * @param  bool   $drop       true if we are dropping the constraint, false if we are adding it
+     * @return string SQL statement
+     */
+    abstract public function add_drop_constraint($table, $definition, $drop = false);
+
+    /**
+     * Returns the description of fields based on the result
+     *
+     * @param  resource $result
+     * @param  boolean  $make_lower_case
+     * @return array field array
+     */
+    abstract public function getFieldsArray($result, $make_lower_case = false);
+
+    /**
+     * Returns an array of tables for this database
+     *
+     * @return	array|false 	an array of with table names, false if no tables found
+     */
+    abstract public function getTablesArray();
+
+    /**
+     * Return's the version of the database
+     *
+     * @return string
+     */
+    abstract public function version();
+
+    /**
+     * Checks if a table with the name $tableName exists
+     * and returns true if it does or false otherwise
+     *
+     * @param  string $tableName
+     * @return bool
+     */
+    abstract public function tableExists($tableName);
+
+    /**
+     * Fetches the next row in the query result into an associative array
+     *
+     * @param  resource $result
+     * @return array    returns false if there are no more rows available to fetch
+     */
+    abstract public function fetchRow($result);
+
+    /**
+     * Connects to the database backend
+     *
+     * Takes in the database settings and opens a database connection based on those
+     * will open either a persistent or non-persistent connection.
+     * If a persistent connection is desired but not available it will defualt to non-persistent
+     *
+     * configOptions must include
+     * db_host_name - server ip
+     * db_user_name - database user name
+     * db_password - database password
+     *
+     * @param array   $configOptions
+     * @param boolean $dieOnError
+     */
+    abstract public function connect(array $configOptions = null, $dieOnError = false);
+
+    /**
+     * Generates sql for create table statement for a bean.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @param  array  $indices
+     * @return string SQL Create Table statement
+     */
+    abstract public function createTableSQLParams($tablename, $fieldDefs, $indices);
+
+    /**
+     * Generates the SQL for changing columns
+     *
+     * @param string $tablename
+     * @param array  $fieldDefs
+     * @param string $action
+     * @param bool   $ignoreRequired Optional, true if we should ignor this being a required field
+     * @return string|array
+     */
+    abstract protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false);
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    abstract public function disconnect();
+
+    /**
+     * Get last database error
+     * This function should return last error as reported by DB driver
+     * and should return false if no error condition happened
+     * @return string|false Error message or false if no error happened
+     */
+    abstract public function lastDbError();
 
     /**
      * Check if this query is valid
@@ -3798,82 +3798,82 @@ 
      * @param string $query
      * @return bool
      */
-	abstract public function validateQuery($query);
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	abstract public function valid();
-
-	/**
-	 * Check if certain database exists
-	 * @param string $dbname
-	 */
-	abstract public function dbExists($dbname);
-
-	/**
-	 * Get tables like expression
-	 * @param string $like Expression describing tables
-	 * @return array
-	 */
-	abstract public function tablesLike($like);
-
-	/**
-	 * Create a database
-	 * @param string $dbname
-	 */
-	abstract public function createDatabase($dbname);
-
-	/**
-	 * Drop a database
-	 * @param string $dbname
-	 */
-	abstract public function dropDatabase($dbname);
-
-	/**
-	 * Get database configuration information (DB-dependent)
-	 * @return array|null
-	 */
-	abstract public function getDbInfo();
-
-	/**
-	 * Check if certain DB user exists
-	 * @param string $username
-	 */
-	abstract public function userExists($username);
-
-	/**
-	 * Create DB user
-	 * @param string $database_name
-	 * @param string $host_name
-	 * @param string $user
-	 * @param string $password
-	 */
-	abstract public function createDbUser($database_name, $host_name, $user, $password);
-
-	/**
-	 * Check if the database supports fulltext indexing
-	 * Note that database driver can be capable of supporting FT (see supports('fulltext))
-	 * but particular instance can still have it disabled
-	 * @return bool
-	 */
-	abstract public function full_text_indexing_installed();
-
-	/**
-	 * Generate fulltext query from set of terms
-	 * @param string $field Field to search against
-	 * @param array $terms Search terms that may be or not be in the result
-	 * @param array $must_terms Search terms that have to be in the result
-	 * @param array $exclude_terms Search terms that have to be not in the result
-	 */
-	abstract public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array());
-
-	/**
-	 * Get install configuration for this DB
-	 * @return array
-	 */
-	abstract public function installConfig();
+    abstract public function validateQuery($query);
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    abstract public function valid();
+
+    /**
+     * Check if certain database exists
+     * @param string $dbname
+     */
+    abstract public function dbExists($dbname);
+
+    /**
+     * Get tables like expression
+     * @param string $like Expression describing tables
+     * @return array
+     */
+    abstract public function tablesLike($like);
+
+    /**
+     * Create a database
+     * @param string $dbname
+     */
+    abstract public function createDatabase($dbname);
+
+    /**
+     * Drop a database
+     * @param string $dbname
+     */
+    abstract public function dropDatabase($dbname);
+
+    /**
+     * Get database configuration information (DB-dependent)
+     * @return array|null
+     */
+    abstract public function getDbInfo();
+
+    /**
+     * Check if certain DB user exists
+     * @param string $username
+     */
+    abstract public function userExists($username);
+
+    /**
+     * Create DB user
+     * @param string $database_name
+     * @param string $host_name
+     * @param string $user
+     * @param string $password
+     */
+    abstract public function createDbUser($database_name, $host_name, $user, $password);
+
+    /**
+     * Check if the database supports fulltext indexing
+     * Note that database driver can be capable of supporting FT (see supports('fulltext))
+     * but particular instance can still have it disabled
+     * @return bool
+     */
+    abstract public function full_text_indexing_installed();
+
+    /**
+     * Generate fulltext query from set of terms
+     * @param string $field Field to search against
+     * @param array $terms Search terms that may be or not be in the result
+     * @param array $must_terms Search terms that have to be in the result
+     * @param array $exclude_terms Search terms that have to be not in the result
+     */
+    abstract public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array());
+
+    /**
+     * Get install configuration for this DB
+     * @return array
+     */
+    abstract public function installConfig();
 
     /**
      * Returns a DB specific FROM clause which can be used to select against functions.
@@ -3890,5 +3890,5 @@ 
      * @abstract
      * @return string
      */
-	abstract public function getGuidSQL();
+    abstract public function getGuidSQL();
 }

Spacing +314 added lines, -314 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -314,7 +314,7 @@ 
 		}
 
 		$dberror = $this->lastDbError();
-		if($dberror === false) {
+		if ($dberror === false) {
     		$this->last_error = false;
 	    	return false;
 		}
@@ -332,16 +332,16 @@ 
 	 */
 	protected function registerError($userMessage, $message, $dieOnError = false)
 	{
-		if(!empty($message)) {
-			if(!empty($userMessage)) {
+		if (!empty($message)) {
+			if (!empty($userMessage)) {
 				$message = "$userMessage: $message";
 			}
-			if(empty($message)) {
+			if (empty($message)) {
 			    $message = "Database error";
 			}
 			$this->log->fatal($message);
 			if ($dieOnError || $this->dieOnError) {
-				if(isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
+				if (isset($GLOBALS['app_strings']['ERR_DB_FAIL'])) {
 					sugar_die($GLOBALS['app_strings']['ERR_DB_FAIL']);
 				} else {
 					sugar_die("Database error. Please check suitecrm.log for details.");
@@ -379,8 +379,8 @@ 
 		$slow_query_time_msec = isset($sugar_config['slow_query_time_msec'])
 			? $sugar_config['slow_query_time_msec'] : 5000;
 
-		if($do_the_dump) {
-			if($slow_query_time_msec < ($this->query_time * 1000)) {
+		if ($do_the_dump) {
+			if ($slow_query_time_msec < ($this->query_time * 1000)) {
 				// Then log both the query and the query time
 				$this->log->fatal('Slow Query (time:'.$this->query_time."\n".$query);
 				return true;
@@ -412,20 +412,20 @@ 
 		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
 
 	if (empty($indices)) {
-		foreach ( $GLOBALS['dictionary'] as $current ) {
-			if ($current['table'] == $table){
+		foreach ($GLOBALS['dictionary'] as $current) {
+			if ($current['table'] == $table) {
 				$indices = $current['indices'];
 				break;
 			}
 		}
 	}
 	if (empty($indices)) {
-		$this->log->warn('CHECK QUERY: Could not find index definitions for table ' . $table);
+		$this->log->warn('CHECK QUERY: Could not find index definitions for table '.$table);
 		return false;
 	}
 	if (!empty($match[2][0])) {
 		$orderBys = explode(' ', $match[2][0]);
-		foreach ($orderBys as $orderBy){
+		foreach ($orderBys as $orderBy) {
 			$orderBy = trim($orderBy);
 			if (empty($orderBy))
 				continue;
@@ -433,7 +433,7 @@ 
 			if ($orderBy == 'asc' || $orderBy == 'desc')
 				continue;
 
-			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
+			$orderBy = str_replace(array($table.'.', ','), '', $orderBy);
 
 			foreach ($indices as $index)
 				if (empty($index['db']) || $index['db'] == $this->dbType)
@@ -441,11 +441,11 @@ 
 						if ($field == $orderBy)
 							return true;
 
-			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
+			$warning = 'Missing Index For Order By Table: '.$table.' Order By:'.$orderBy;
 			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
+				$this->log->fatal('CHECK QUERY:'.$warning);
 			else
-				$this->log->warn('CHECK QUERY:' .$warning);
+				$this->log->warn('CHECK QUERY:'.$warning);
 		}
 	}
 	return false;
@@ -491,9 +491,9 @@ 
 	public function insert(SugarBean $bean)
 	{
 		$sql = $this->insertSQL($bean);
-		$tablename =  $bean->getTableName();
+		$tablename = $bean->getTableName();
 		$msg = "Error inserting into table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -512,13 +512,13 @@ 
 		{
 			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
 			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+			if (!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
 
-			if(isset($data[$field])) {
+			if (isset($data[$field])) {
 				// clean the incoming value..
 				$val = from_html($data[$field]);
 			} else {
-				if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+				if (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
 					$val = $fieldDef['default'];
 				} else {
 					$val = null;
@@ -528,26 +528,26 @@ 
 			//handle auto increment values here - we may have to do something like nextval for oracle
 			if (!empty($fieldDef['auto_increment'])) {
 				$auto = $this->getAutoIncrementSQL($table, $fieldDef['name']);
-				if(!empty($auto)) {
+				if (!empty($auto)) {
 					$values[$field] = $auto;
 				}
 			} elseif ($fieldDef['name'] == 'deleted') {
 				$values['deleted'] = (int)$val;
 			} else {
 				// need to do some thing about types of values
-				if(!is_null($val) || !empty($fieldDef['required'])) {
+				if (!is_null($val) || !empty($fieldDef['required'])) {
 					$values[$field] = $this->massageValue($val, $fieldDef);
 				}
 			}
 		}
 
 		if (empty($values))
-			return $execute?true:''; // no columns set
+			return $execute ? true : ''; // no columns set
 
 		// get the entire sql
 		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
 					VALUES (".implode(",", $values).")";
-		return $execute?$this->query($query):$query;
+		return $execute ? $this->query($query) : $query;
 	}
 
     /**
@@ -565,7 +565,7 @@ 
 		$sql = $this->updateSQL($bean, $where);
 		$tablename = $bean->getTableName();
 		$msg = "Error updating table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
     /**
@@ -581,8 +581,8 @@ 
 	{
 		$sql = $this->deleteSQL($bean, $where);
 		$tableName = $bean->getTableName();
-		$msg = "Error deleting from table: ".$tableName. ":";
-		return $this->query($sql,true,$msg);
+		$msg = "Error deleting from table: ".$tableName.":";
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -599,8 +599,8 @@ 
 	{
 		$sql = $this->retrieveSQL($bean, $where);
 		$tableName = $bean->getTableName();
-		$msg = "Error retriving values from table:".$tableName. ":";
-		return $this->query($sql,true,$msg);
+		$msg = "Error retriving values from table:".$tableName.":";
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	{
 		$sql = $this->retrieveViewSQL($beans, $cols, $where);
 		$msg = "Error retriving values from View Collection:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 
@@ -638,8 +638,8 @@ 
 		$sql = $this->createTableSQL($bean);
 		$tablename = $bean->getTableName();
 		$msg = "Error creating table: $tablename:";
-		$this->query($sql,true,$msg);
-		if(!$this->supports("inline_keys")) {
+		$this->query($sql, true, $msg);
+		if (!$this->supports("inline_keys")) {
 		// handle constraints and indices
 			$indicesArr = $this->createConstraintSql($bean);
 			if (count($indicesArr) > 0)
@@ -676,9 +676,9 @@ 
 			$res = true;
 			if ($sql) {
 				$msg = "Error creating table: $tablename";
-				$res = ($res and $this->query($sql,true,$msg));
+				$res = ($res and $this->query($sql, true, $msg));
 			}
-			if(!$this->supports("inline_keys")) {
+			if (!$this->supports("inline_keys")) {
 				// handle constraints and indices
 				$indicesArr = $this->getConstraintSql($indices, $tablename);
 				if (count($indicesArr) > 0)
@@ -705,20 +705,20 @@ 
 
 		//Clean the indexes to prevent duplicate definitions
 		$new_index = array();
-		foreach($indices as $ind_def){
+		foreach ($indices as $ind_def) {
 			$new_index[$ind_def['name']] = $ind_def;
 		}
 		//jc: added this for beans that do not actually have a table, namely
 		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
+		if ($tablename == 'does_not_exist' || $tablename == '')
 			return '';
 
 		global $dictionary;
-		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
+		$engine = null;
+		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']))
 			$engine = $dictionary[$bean->getObjectName()]['engine'];
 
-		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
+		return $this->repairTableParams($tablename, $fielddefs, $new_index, $execute, $engine);
 	}
 
 	/**
@@ -730,12 +730,12 @@ 
 	protected function isNullable($vardef)
 	{
 
-		if(isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
+		if (isset($vardef['isnull']) && (strtolower($vardef['isnull']) == 'false' || $vardef['isnull'] === false)
 			&& !empty($vardef['required'])) {
 				/* required + is_null=false => not null */
 			return false;
 		}
-		if(empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
+		if (empty($vardef['auto_increment']) && (empty($vardef['type']) || $vardef['type'] != 'id')
 					&& (empty($vardef['dbType']) || $vardef['dbType'] != 'id')
 					&& (empty($vardef['name']) || ($vardef['name'] != 'id' && $vardef['name'] != 'deleted'))
 		) {
@@ -756,7 +756,7 @@ 
      * @todo: refactor engine param to be more generic
      * @return string
      */
-	public function repairTableParams($tablename, $fielddefs,  $indices, $execute = true, $engine = null)
+	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
 		//jc: had a bug when running the repair if the tablename is blank the repair will
 		//fail when it tries to create a repair table
@@ -766,13 +766,13 @@ 
 		//if the table does not exist create it and we are done
 		$sql = "/* Table : $tablename */\n";
 		if (!$this->tableExists($tablename)) {
-			$createtablesql = $this->createTableSQLParams($tablename,$fielddefs,$indices,$engine);
-			if($execute && $createtablesql){
-				$this->createTableParams($tablename,$fielddefs,$indices,$engine);
+			$createtablesql = $this->createTableSQLParams($tablename, $fielddefs, $indices, $engine);
+			if ($execute && $createtablesql) {
+				$this->createTableParams($tablename, $fielddefs, $indices, $engine);
 			}
 
 			$sql .= "/* MISSING TABLE: {$tablename} */\n";
-			$sql .= $createtablesql . "\n";
+			$sql .= $createtablesql."\n";
 			return $sql;
 		}
 
@@ -782,7 +782,7 @@ 
 		$take_action = false;
 
 		// do column comparisons
-		$sql .=	"/*COLUMNS*/\n";
+		$sql .= "/*COLUMNS*/\n";
 		foreach ($fielddefs as $name => $value) {
 			if (isset($value['source']) && $value['source'] != 'db')
 				continue;
@@ -801,9 +801,9 @@ 
 
 			$name = strtolower($value['name']);
 			// add or fix the field defs per what the DB is expected to give us back
-			$this->massageFieldDef($value,$tablename);
+			$this->massageFieldDef($value, $tablename);
 
-			$ignorerequired=false;
+			$ignorerequired = false;
 
 			//Do not track requiredness in the DB, auto_increment, ID,
 			// and deleted fields are always required in the DB, so don't force those
@@ -819,32 +819,32 @@ 
 				$value['required'] = $compareFieldDefs[$name]['required'];
 			}
 
-			if ( !isset($compareFieldDefs[$name]) ) {
+			if (!isset($compareFieldDefs[$name])) {
 				// ok we need this field lets create it
-				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
-				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
+				$sql .= "/*MISSING IN DATABASE - $name -  ROW*/\n";
+				$sql .= $this->addColumnSQL($tablename, $value)."\n";
 				if ($execute)
 					$this->addColumn($tablename, $value);
 				$take_action = true;
-			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
+			} elseif (!$this->compareVarDefs($compareFieldDefs[$name], $value)) {
 				//fields are different lets alter it
-				$sql .=	"/*MISMATCH WITH DATABASE - $name -  ROW ";
-				foreach($compareFieldDefs[$name] as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
+				$sql .= "/*MISMATCH WITH DATABASE - $name -  ROW ";
+				foreach ($compareFieldDefs[$name] as $rKey => $rValue) {
+					$sql .= "[$rKey] => '$rValue'  ";
 				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
-				foreach($value as $rKey => $rValue) {
-					$sql .=	"[$rKey] => '$rValue'  ";
+				$sql .= "*/\n";
+				$sql .= "/* VARDEF - $name -  ROW";
+				foreach ($value as $rKey => $rValue) {
+					$sql .= "[$rKey] => '$rValue'  ";
 				}
-				$sql .=	"*/\n";
+				$sql .= "*/\n";
 
 				//jc: oracle will complain if you try to execute a statement that sets a column to (not) null
 				//when it is already (not) null
-				if ( isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
+				if (isset($value['isnull']) && isset($compareFieldDefs[$name]['isnull']) &&
 					$value['isnull'] === $compareFieldDefs[$name]['isnull']) {
 					unset($value['required']);
-					$ignorerequired=true;
+					$ignorerequired = true;
 				}
 
 				//dwheeler: Once a column has been defined as null, we cannot try to force it back to !null
@@ -853,12 +853,12 @@ 
 				{
 					$ignorerequired = true;
 				}
-				$altersql = $this->alterColumnSQL($tablename, $value,$ignorerequired);
-				if(is_array($altersql)) {
+				$altersql = $this->alterColumnSQL($tablename, $value, $ignorerequired);
+				if (is_array($altersql)) {
 					$altersql = join("\n", $altersql);
 				}
-				$sql .= $altersql .  "\n";
-				if($execute){
+				$sql .= $altersql."\n";
+				if ($execute) {
 					$this->alterColumn($tablename, $value, $ignorerequired);
 				}
 				$take_action = true;
@@ -866,13 +866,13 @@ 
 		}
 
 		// do index comparisons
-		$sql .=	"/* INDEXES */\n";
+		$sql .= "/* INDEXES */\n";
 		$correctedIndexs = array();
 
         $compareIndices_case_insensitive = array();
 
 		// do indices comparisons case-insensitive
-		foreach($compareIndices as $k => $value){
+		foreach ($compareIndices as $k => $value) {
 			$value['name'] = strtolower($value['name']);
 			$compareIndices_case_insensitive[strtolower($k)] = $value;
 		}
@@ -899,59 +899,59 @@ 
 				continue;
 
 			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
+			if ($value['type'] == 'fulltext')
 				continue;
 
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
+			if (in_array($value['type'], array('alternate_key', 'foreign')))
 				$value['type'] = 'index';
 
-			if ( !isset($compareIndices[$name]) ) {
+			if (!isset($compareIndices[$name])) {
 				//First check if an index exists that doesn't match our name, if so, try to rename it
 				$found = false;
 				foreach ($compareIndices as $ex_name => $ex_value) {
-					if($this->compareVarDefs($ex_value, $value, true)) {
+					if ($this->compareVarDefs($ex_value, $value, true)) {
 						$found = $ex_name;
 						break;
 					}
 				}
 				if ($found) {
-					$sql .=	 "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
+					$sql .= "/*MISSNAMED INDEX IN DATABASE - $name - $ex_name */\n";
 					$rename = $this->renameIndexDefs($ex_value, $value, $tablename);
-					if($execute) {
+					if ($execute) {
 						$this->query($rename, true, "Cannot rename index");
 					}
-					$sql .= is_array($rename)?join("\n", $rename). "\n":$rename."\n";
+					$sql .= is_array($rename) ? join("\n", $rename)."\n" : $rename."\n";
 
 				} else {
 					// ok we need this field lets create it
-					$sql .=	 "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
-					$sql .= $this->addIndexes($tablename,array($value), $execute) .  "\n";
+					$sql .= "/*MISSING INDEX IN DATABASE - $name -{$value['type']}  ROW */\n";
+					$sql .= $this->addIndexes($tablename, array($value), $execute)."\n";
 				}
 				$take_action = true;
 				$correctedIndexs[$name] = true;
-			} elseif ( !$this->compareVarDefs($compareIndices[$name],$value) ) {
+			} elseif (!$this->compareVarDefs($compareIndices[$name], $value)) {
 				// fields are different lets alter it
-				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
+				$sql .= "/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
 				foreach ($compareIndices[$name] as $n1 => $t1) {
-					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
+					$sql .= "<$n1>";
+					if ($n1 == 'fields')
+						foreach ($t1 as $rKey => $rValue)
 							$sql .= "[$rKey] => '$rValue'  ";
 					else
 						$sql .= " $t1 ";
 				}
-				$sql .=	"*/\n";
-				$sql .=	"/* VARDEF - $name -  ROW";
+				$sql .= "*/\n";
+				$sql .= "/* VARDEF - $name -  ROW";
 				foreach ($value as $n1 => $t1) {
-					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
+					$sql .= "<$n1>";
+					if ($n1 == 'fields')
 						foreach ($t1 as $rKey => $rValue)
-							$sql .=	"[$rKey] => '$rValue'  ";
+							$sql .= "[$rKey] => '$rValue'  ";
 					else
 						$sql .= " $t1 ";
 				}
-				$sql .=	"*/\n";
-				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
+				$sql .= "*/\n";
+				$sql .= $this->modifyIndexes($tablename, array($value), $execute)."\n";
 				$take_action = true;
 				$correctedIndexs[$name] = true;
 			}
@@ -970,7 +970,7 @@ 
      */
 	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
 	{
-		foreach ( $fielddef1 as $key => $value ) {
+		foreach ($fielddef1 as $key => $value) {
 			if ($key == 'name' && $ignoreName)
 				continue;
             if (isset($fielddef2[$key]))
@@ -984,7 +984,7 @@ 
                 }
                 else
                 {
-                    if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower',$fielddef2[$key]))
+                    if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower', $fielddef2[$key]))
                     {
                         continue;
                     }
@@ -1033,9 +1033,9 @@ 
 				}
 				else {
 					$returnArray['msg'] = 'match';
-					foreach($row1 as $key => $value){
+					foreach ($row1 as $key => $value) {
 						//ignore keys when checking we will check them when we do the index check
-						if( !isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])){
+						if (!isset($ignore_filter[$key]) && (!isset($row2[$key]) || $row1[$key] !== $row2[$key])) {
 							$returnArray['msg'] = 'no_match';
 						}
 					}
@@ -1111,7 +1111,7 @@ 
 		$sql = $this->createIndexSQL($bean, $fieldDefs, $name, $unique);
 		$tablename = $bean->getTableName();
 		$msg = "Error creating index $name on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -1128,14 +1128,14 @@ 
 		$columns = array();
 
 		foreach ($indices as $index) {
-			if(!empty($index['db']) && $index['db'] != $this->dbType)
+			if (!empty($index['db']) && $index['db'] != $this->dbType)
 				continue;
 			if (isset($index['source']) && $index['source'] != 'db')
 			continue;
 
 			$sql = $this->add_drop_constraint($table, $index);
 
-			if(!empty($sql)) {
+			if (!empty($sql)) {
 				$columns[] = $sql;
 			}
 		}
@@ -1155,11 +1155,11 @@ 
 	{
 		$alters = $this->getConstraintSql($indexes, $tablename);
 		if ($execute) {
-			foreach($alters as $sql) {
+			foreach ($alters as $sql) {
 				$this->query($sql, true, "Error adding index: ");
 			}
 		}
-		if(!empty($alters)) {
+		if (!empty($alters)) {
 			$sql = join(";\n", $alters).";\n";
 		} else {
 			$sql = '';
@@ -1179,17 +1179,17 @@ 
 	{
 		$sqls = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			$sqls[$name] = $this->add_drop_constraint($tablename,$index,true);
+			$name = $index['name'];
+			$sqls[$name] = $this->add_drop_constraint($tablename, $index, true);
 		}
 		if (!empty($sqls) && $execute) {
-			foreach($sqls as $name => $sql) {
+			foreach ($sqls as $name => $sql) {
 				unset(self::$index_descriptions[$tablename][$name]);
 				$this->query($sql);
 			}
 		}
-		if(!empty($sqls)) {
-			return join(";\n",$sqls).";";
+		if (!empty($sqls)) {
+			return join(";\n", $sqls).";";
 		} else {
 			return '';
 		}
@@ -1219,7 +1219,7 @@ 
 	public function addColumn($tablename, $fieldDefs)
 	{
 		$sql = $this->addColumnSQL($tablename, $fieldDefs);
-		if ($this->isFieldArray($fieldDefs)){
+		if ($this->isFieldArray($fieldDefs)) {
 			$columns = array();
 			foreach ($fieldDefs as $fieldDef)
 				$columns[] = $fieldDef['name'];
@@ -1229,7 +1229,7 @@ 
 			$columns = $fieldDefs['name'];
 		}
 		$msg = "Error adding column(s) $columns on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
 	/**
@@ -1242,8 +1242,8 @@ 
      */
 	public function alterColumn($tablename, $newFieldDef, $ignoreRequired = false)
 	{
-		$sql = $this->alterColumnSQL($tablename, $newFieldDef,$ignoreRequired);
-		if ($this->isFieldArray($newFieldDef)){
+		$sql = $this->alterColumnSQL($tablename, $newFieldDef, $ignoreRequired);
+		if ($this->isFieldArray($newFieldDef)) {
 			$columns = array();
 			foreach ($newFieldDef as $fieldDef) {
 				$columns[] = $fieldDef['name'];
@@ -1255,8 +1255,8 @@ 
 		}
 
 		$msg = "Error altering column(s) $columns on table: $tablename:";
-		$res = $this->query($sql,true,$msg);
-		if($res) {
+		$res = $this->query($sql, true, $msg);
+		if ($res) {
 			$this->getTableDescription($tablename, true); // reload table description after altering
 		}
 		return $res;
@@ -1282,7 +1282,7 @@ 
 	public function dropTableName($name)
 	{
 		$sql = $this->dropTableNameSQL($name);
-		return $this->query($sql,true,"Error dropping table $name:");
+		return $this->query($sql, true, "Error dropping table $name:");
 	}
 
     /**
@@ -1297,7 +1297,7 @@ 
 		$tablename = $bean->getTableName();
 		$sql = $this->dropColumnSQL($tablename, $fieldDefs);
 		$msg = "Error deleting column(s) on table: $tablename:";
-		return $this->query($sql,true,$msg);
+		return $this->query($sql, true, $msg);
 	}
 
     /**
@@ -1320,18 +1320,18 @@ 
 
 		$rows_found = 0;
 		$count_query = $bean->create_list_count_query($select_query);
-		if(!empty($count_query))
+		if (!empty($count_query))
 		{
 			// We have a count query.  Run it and get the results.
 			$result = $this->query($count_query, true, "Error running count query for $this->object_name List: ");
 			$assoc = $this->fetchByAssoc($result);
-			if(!empty($assoc['c']))
+			if (!empty($assoc['c']))
 			{
 				$rows_found = $assoc['c'];
 			}
 		}
-		if($count == -1){
-			$count 	= $sugar_config['list_max_entries_per_page'];
+		if ($count == -1) {
+			$count = $sugar_config['list_max_entries_per_page'];
 		}
 		$next_offset = $start + $count;
 
@@ -1344,13 +1344,13 @@ 
 		$fields = $bean->getFieldDefinitions();
 		$custom_fields = array();
 
-		if($bean->hasCustomFields()){
-			foreach ($fields as $fieldDef){
-				if($fieldDef['source'] == 'custom_fields'){
+		if ($bean->hasCustomFields()) {
+			foreach ($fields as $fieldDef) {
+				if ($fieldDef['source'] == 'custom_fields') {
 					$custom_fields[$fieldDef['name']] = $fieldDef['name'];
 				}
 			}
-			if(!empty($custom_fields)){
+			if (!empty($custom_fields)) {
 				$custom_fields['id_c'] = 'id_c';
 				$id_field = array('name' => 'id_c', 'custom_type' => 'id',);
 				$fields[] = $id_field;
@@ -1363,50 +1363,50 @@ 
 		$cstm_row_array = array();
 		$cstm_columns = array();
 		$built_columns = false;
-		while(($row = $this->fetchByAssoc($result)) != null)
+		while (($row = $this->fetchByAssoc($result)) != null)
 		{
 			$values = array();
 			$cstm_values = array();
-			if(!$is_related_query){
+			if (!$is_related_query) {
 				foreach ($fields as $fieldDef)
 				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+					if (isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
 					$val = $row[$fieldDef['name']];
 
 					//handle auto increment values here only need to do this on insert not create
-					if ($fieldDef['name'] == 'deleted'){
+					if ($fieldDef['name'] == 'deleted') {
 							$values['deleted'] = $val;
-							if(!$built_columns){
+							if (!$built_columns) {
 							$columns[] = 'deleted';
 						}
 					}
 					else
 					{
 						$type = $fieldDef['type'];
-						if(!empty($fieldDef['custom_type'])){
+						if (!empty($fieldDef['custom_type'])) {
 							$type = $fieldDef['custom_type'];
 						}
 						// need to do some thing about types of values
-						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
+						if ($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' || $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')) {
+							if (!empty($custom_fields[$fieldDef['name']]))
 								$cstm_values[$fieldDef['name']] = 'null';
 							else
 								$values[$fieldDef['name']] = 'null';
-						}else{
-							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
+						} else {
+							if (isset($type) && $type == 'int') {
+								if (!empty($custom_fields[$fieldDef['name']]))
 									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
 								else
 									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
 							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
+								if (!empty($custom_fields[$fieldDef['name']]))
 									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
 								else
 									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
 							}
 						}
-						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
+						if (!$built_columns) {
+							if (!empty($custom_fields[$fieldDef['name']]))
 								$cstm_columns[] = $fieldDef['name'];
 							else
 								$columns[] = $fieldDef['name'];
@@ -1417,19 +1417,19 @@ 
 			} else {
 			foreach ($row as $key=>$val)
 			{
-					if($key != 'orc_row'){
+					if ($key != 'orc_row') {
 						$values[$key] = "'$val'";
-						if(!$built_columns){
+						if (!$built_columns) {
 							$columns[] = $key;
 						}
 					}
 			}
 			}
 			$built_columns = true;
-			if(!empty($values)){
+			if (!empty($values)) {
 				$row_array[] = $values;
 			}
-			if(!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)){
+			if (!empty($cstm_values) && !empty($cstm_values['id_c']) && (strlen($cstm_values['id_c']) > 7)) {
 				$cstm_row_array[] = $cstm_values;
 			}
 		}
@@ -1439,9 +1439,9 @@ 
 		// get the entire sql
 		$sql .= "(".implode(",", $columns).") ";
 		$sql .= "VALUES";
-		for($i = 0; $i < count($row_array); $i++){
+		for ($i = 0; $i < count($row_array); $i++) {
 			$sql .= " (".implode(",", $row_array[$i]).")";
-			if($i < (count($row_array) - 1)){
+			if ($i < (count($row_array) - 1)) {
 				$sql .= ", ";
 			}
 		}
@@ -1450,9 +1450,9 @@ 
 		$custom_sql .= "(".implode(",", $cstm_columns).") ";
 		$custom_sql .= "VALUES";
 
-		for($i = 0; $i < count($cstm_row_array); $i++){
+		for ($i = 0; $i < count($cstm_row_array); $i++) {
 			$custom_sql .= " (".implode(",", $cstm_row_array[$i]).")";
-			if($i < (count($cstm_row_array) - 1)){
+			if ($i < (count($cstm_row_array) - 1)) {
 				$custom_sql .= ", ";
 			}
 		}
@@ -1545,17 +1545,17 @@ 
      */
     public function quoteType($type, $value)
 	{
-	    if($type == 'date') {
+	    if ($type == 'date') {
 	        return $this->convert($this->quoted($value), "date");
 	    }
-	    if($type == 'time') {
+	    if ($type == 'time') {
 	        return $this->convert($this->quoted($value), "time");
 	    }
-        if(isset($this->type_class[$type]) &&  $this->type_class[$type] == "date") {
+        if (isset($this->type_class[$type]) && $this->type_class[$type] == "date") {
             return $this->convert($this->quoted($value), "datetime");
         }
-        if($this->isNumericType($type)) {
-            return 0+$value; // ensure it's numeric
+        if ($this->isNumericType($type)) {
+            return 0 + $value; // ensure it's numeric
         }
 
         return $this->quoted($value);
@@ -1571,7 +1571,7 @@ 
      */
 	public function arrayQuote(array &$array)
 	{
-		foreach($array as &$val) {
+		foreach ($array as &$val) {
 			$val = $this->quote($val);
 		}
 		return $array;
@@ -1584,10 +1584,10 @@ 
      */
 	protected function freeResult($result = false)
 	{
-		if($result) {
+		if ($result) {
 			$this->freeDbResult($result);
 		}
-		if($this->lastResult) {
+		if ($this->lastResult) {
 			$this->freeDbResult($this->lastResult);
 			$this->lastResult = null;
 		}
@@ -1616,17 +1616,17 @@ 
 	public function getOne($sql, $dieOnError = false, $msg = '')
 	{
 		$this->log->info("Get One: |$sql|");
-		if(!$this->hasLimit($sql)) {
+		if (!$this->hasLimit($sql)) {
 		    $queryresult = $this->limitQuery($sql, 0, 1, $dieOnError, $msg);
 		} else {
 		    // support old code that passes LIMIT to sql
 		    // works only for mysql, so do not rely on this
 		    $queryresult = $this->query($sql, $dieOnError, $msg);
 		}
-		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
+		$this->checkError($msg.' Get One Failed:'.$sql, $dieOnError);
 		if (!$queryresult) return false;
 		$row = $this->fetchByAssoc($queryresult);
-		if(!empty($row)) {
+		if (!empty($row)) {
 			return array_shift($row);
 		}
 		return false;
@@ -1646,12 +1646,12 @@ 
 		$this->log->info("Fetch One: |$sql|");
 		$this->checkConnection();
 		$queryresult = $this->query($sql, $dieOnError, $msg);
-		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
+		$this->checkError($msg.' Fetch One Failed:'.$sql, $dieOnError);
 
 		if (!$queryresult) return false;
 
 		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
+		if (!$row) return false;
 
 		$this->freeResult($queryresult);
 		return $row;
@@ -1692,7 +1692,7 @@ 
      */
 	public function getTableDescription($tablename, $reload = false)
 	{
-		if($reload || empty(self::$table_descriptions[$tablename])) {
+		if ($reload || empty(self::$table_descriptions[$tablename])) {
 			self::$table_descriptions[$tablename] = $this->get_columns($tablename);
 		}
 		return self::$table_descriptions[$tablename];
@@ -1708,12 +1708,12 @@ 
 	protected function describeField($name, $tablename)
 	{
 		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
+		if (!empty($table) && isset($table[$name]))
 			return 	$table[$name];
 
 		$table = $this->getTableDescription($tablename, true);
 
-		if(isset($table[$name]))
+		if (isset($table[$name]))
 		return $table[$name];
 
 		return array();
@@ -1728,13 +1728,13 @@ 
 	 */
 	protected function describeIndex($name, $tablename)
 	{
-		if(isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])){
+		if (isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename]) && isset(self::$index_descriptions[$tablename][$name])) {
 			return 	self::$index_descriptions[$tablename][$name];
 		}
 
 		self::$index_descriptions[$tablename] = $this->get_indices($tablename);
 
-		if(isset(self::$index_descriptions[$tablename][$name])){
+		if (isset(self::$index_descriptions[$tablename][$name])) {
 			return 	self::$index_descriptions[$tablename][$name];
 		}
 
@@ -1751,9 +1751,9 @@ 
      */
 	public function truncate($string, $len)
 	{
-		if ( is_numeric($len) && $len > 0)
+		if (is_numeric($len) && $len > 0)
 		{
-			$string = mb_substr($string,0,(int) $len, "UTF-8");
+			$string = mb_substr($string, 0, (int)$len, "UTF-8");
 		}
 		return $string;
 	}
@@ -1768,11 +1768,11 @@ 
      */
 	public function concat($table, array $fields, $space = ' ')
 	{
-		if(empty($fields)) return '';
+		if (empty($fields)) return '';
 		$elems = array();
 		$space = $this->quoted($space);
-		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
+		foreach ($fields as $field) {
+			if (!empty($elems)) $elems[] = $space;
 			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
 		}
 		$first = array_shift($elems);
@@ -1829,8 +1829,8 @@ 
 	 */
 	public function executePreparedQuery($stmt, $data = array())
 	{
-		if(!empty($this->preparedTokens[$stmt])){
-			if(!is_array($data)){
+		if (!empty($this->preparedTokens[$stmt])) {
+			if (!is_array($data)) {
 				$data = array($data);
 			}
 
@@ -1838,7 +1838,7 @@ 
 
 			//ensure that the number of data elements matches the number of replacement tokens
 			//we found in prepare().
-			if(count($data) != $pTokens['tokenCount']){
+			if (count($data) != $pTokens['tokenCount']) {
 				//error the data count did not match the token count
 				return false;
 			}
@@ -1864,7 +1864,7 @@ 
 				}//switch
 			}//foreach
 			return $this->query($query);
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -1908,7 +1908,7 @@ 
 	{
 		// get column names and values
 		$sql = $this->insertParams($bean->getTableName(), $bean->getFieldDefinitions(), get_object_vars($bean),
-		        isset($bean->field_name_map)?$bean->field_name_map:null, false);
+		        isset($bean->field_name_map) ? $bean->field_name_map : null, false);
 		return $sql;
 	}
 
@@ -1936,48 +1936,48 @@ 
     		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
 
     		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+    		if (isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
 
     		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+    		if ($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
 
-    		if(isset($bean->$field)) {
+    		if (isset($bean->$field)) {
     			$val = from_html($bean->$field);
     		} else {
     			continue;
     		}
 
-    		if(!empty($fieldDef['type']) && $fieldDef['type'] == 'bool'){
+    		if (!empty($fieldDef['type']) && $fieldDef['type'] == 'bool') {
     			$val = $bean->getFieldValue($field);
     		}
 
-    		if(strlen($val) == 0) {
-    			if(isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
+    		if (strlen($val) == 0) {
+    			if (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0) {
     				$val = $fieldDef['default'];
     			} else {
     				$val = null;
     			}
     		}
 
-    		if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+    		if (!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
 			    $val = $this->truncate($val, $fieldDef['len']);
 			}
 		$columnName = $this->quoteIdentifier($fieldDef['name']);
-    		if(!is_null($val) || !empty($fieldDef['required'])) {
+    		if (!is_null($val) || !empty($fieldDef['required'])) {
     			$columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);
-    		} elseif($this->isNullable($fieldDef)) {
+    		} elseif ($this->isNullable($fieldDef)) {
     			$columns[] = "{$columnName}=NULL";
     		} else {
     		    $columns[] = "{$columnName}=".$this->emptyValue($fieldDef['type']);
     		}
 		}
 
-		if ( sizeof($columns) == 0 )
+		if (sizeof($columns) == 0)
 			return ""; // no columns set
 
 		// build where clause
 		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
-		if(isset($fields['deleted'])) {
+		if (isset($fields['deleted'])) {
 		    $where .= " AND deleted=0";
 		}
 
@@ -2001,7 +2001,7 @@ 
 			$primaryColumn = $fieldDef['name'];
 
 			$val = $bean->getFieldValue($fieldDef['name']);
-			if ($val != FALSE){
+			if ($val != FALSE) {
 				$where[$primaryColumn] = $val;
 			}
 		}
@@ -2027,7 +2027,7 @@ 
 			if (is_array($val)) {
 				$op = "IN";
 				$temp = array();
-				foreach ($val as $tval){
+				foreach ($val as $tval) {
 					$temp[] = $this->quoted($tval);
 				}
 				$val = implode(",", $temp);
@@ -2053,9 +2053,9 @@ 
 	 * @param  array  $whereArray Optional, where conditions in an array
 	 * @return string
 	 */
-	protected function getWhereClause(SugarBean $bean, array $whereArray=array())
+	protected function getWhereClause(SugarBean $bean, array $whereArray = array())
 	{
-	    return " WHERE " . $this->getColumnWhereClause($bean->getTableName(), $whereArray);
+	    return " WHERE ".$this->getColumnWhereClause($bean->getTableName(), $whereArray);
 	}
 
 	/**
@@ -2069,13 +2069,13 @@ 
 	{
 		$type = $this->getFieldType($fieldDef);
 
-		if(isset($this->type_class[$type])) {
+		if (isset($this->type_class[$type])) {
 			// handle some known types
-			switch($this->type_class[$type]) {
+			switch ($this->type_class[$type]) {
 				case 'bool':
 				case 'int':
-					if (!empty($fieldDef['required']) && $val == ''){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == '') {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
@@ -2083,16 +2083,16 @@ 
 					return intval($val);
                 case 'bigint' :
                     $val = (float)$val;
-					if (!empty($fieldDef['required']) && $val == false){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == false) {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
 					}
                     return $val;
 				case 'float':
-					if (!empty($fieldDef['required'])  && $val == ''){
-						if (isset($fieldDef['default'])){
+					if (!empty($fieldDef['required']) && $val == '') {
+						if (isset($fieldDef['default'])) {
 							return $fieldDef['default'];
 						}
 						return 0;
@@ -2101,7 +2101,7 @@ 
 				case 'time':
 				case 'date':
 					// empty date can't be '', so convert it to either NULL or empty date value
-					if($val == '') {
+					if ($val == '') {
 						if (!empty($fieldDef['required'])) {
 							if (isset($fieldDef['default'])) {
 								return $fieldDef['default'];
@@ -2113,14 +2113,14 @@ 
 					break;
 			}
 		} else {
-		    if(!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
+		    if (!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
 			    $val = $this->truncate($val, $fieldDef['len']);
 			}
 		}
 
-		if ( is_null($val) ) {
-			if(!empty($fieldDef['required'])) {
-				if (isset($fieldDef['default'])  && $fieldDef['default'] != ''){
+		if (is_null($val)) {
+			if (!empty($fieldDef['required'])) {
+				if (isset($fieldDef['default']) && $fieldDef['default'] != '') {
 					return $fieldDef['default'];
 				}
 				return $this->emptyValue($type);
@@ -2128,7 +2128,7 @@ 
 				return "NULL";
 			}
 		}
-        if($type == "datetimecombo") {
+        if ($type == "datetimecombo") {
             $type = "datetime";
         }
 		return $this->convert($this->quoted($val), $type);
@@ -2143,23 +2143,23 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
+		if (!isset($fieldDef['dbType'])) {
+			if (isset($fieldDef['dbtype']))
 				$fieldDef['dbType'] = $fieldDef['dbtype'];
 			else
 				$fieldDef['dbType'] = $fieldDef['type'];
 		}
-		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
+		$type = $this->getColumnType($fieldDef['dbType'], $fieldDef['name'], $tablename);
 		$matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
+		if (isset($matches[1][0]))
 			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
+		if (isset($matches[2][0]) && empty($fieldDef['len']))
 			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
+		if (!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'], ','))
 			$fieldDef['len'] .= ",{$fieldDef['precision']}";
-		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
+		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required']))) {
 			$fieldDef['required'] = 'true';
 		}
 	}
@@ -2180,7 +2180,7 @@ 
 		$level = 0;
 		$selectField = "";
 		$strLen = strlen($selectStatement);
-		for($i = 0; $i < $strLen; $i++)
+		for ($i = 0; $i < $strLen; $i++)
 		{
 			$char = $selectStatement[$i];
 
@@ -2190,16 +2190,16 @@ 
 				$fields[$field] = $selectField;
 				$selectField = "";
 			}
-			else if ($char == "("){
+			else if ($char == "(") {
 				$level++;
 				$selectField .= $char;
 			}
-			else if($char == ")"){
+			else if ($char == ")") {
 				$level--;
 				$selectField .= $char;
 
 
-			}else{
+			} else {
 				$selectField .= $char;
 			}
 
@@ -2215,7 +2215,7 @@ 
      */
 	protected function getFieldNameFromSelect($string)
 	{
-		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
+		if (strncasecmp($string, "DISTINCT ", 9) == 0) {
 			$string = substr($string, 9);
 		}
 		if (stripos($string, " as ") !== false)
@@ -2293,14 +2293,14 @@ 
 				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
 
 			// build part of where clause
-			if (is_array($whereClause[$beanID])){
+			if (is_array($whereClause[$beanID])) {
 				$where[] = $this->getColumnWhereClause($table, $whereClause[$beanID]);
 			}
 			// initialize so that it can be used properly in form clause generation
 			$table_used_in_from[$table] = false;
 
 			$indices = $bean->getIndices();
-			foreach ($indices as $index){
+			foreach ($indices as $index) {
 				if ($index['type'] == 'foreign') {
 					$relationship[$table][] = array('foreignTable'=> $index['foreignTable']
 												,'foreignColumn'=>$index['foreignField']
@@ -2321,12 +2321,12 @@ 
 		// table2 is assumed to joining through primary key called id
 		$separator = "";
 		$from = ''; $table_used_in_from = array();
-		foreach ($relations as $table1 => $rightsidearray){
+		foreach ($relations as $table1 => $rightsidearray) {
 			if ($table_used_in_from[$table1]) continue; // table has been joined
 
 			$from .= $separator." ".$table1;
 			$table_used_in_from[$table1] = true;
-			foreach ($rightsidearray as $tablearray){
+			foreach ($rightsidearray as $tablearray) {
 				$table2 = $tablearray['foreignTable']; // get foreign table
 				$tableAlias = $aliases[$table2]; // get a list of aliases for this table
 				foreach ($tableAlias as $table2) {
@@ -2386,9 +2386,9 @@ 
 		// we do not have change a lot of existing code
 		// and add dbtype where type is being used for some special
 		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
+		if (!empty($fieldDef['dbType']))
 			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
+		if (!empty($fieldDef['dbtype']))
 			return  $fieldDef['dbtype'];
 		if (!empty($fieldDef['type']))
 			return  $fieldDef['type'];
@@ -2408,17 +2408,17 @@ 
      */
     public function getTypeParts($type)
     {
-        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
+        if (preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
         {
-            $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
+            $return = array(); // Not returning matches array as such as we don't want to expose the regex make up on the interface
             $return['baseType'] = $matches['type'];
-            if( isset($matches['arg'])) {
+            if (isset($matches['arg'])) {
                 $return['arg'] = $matches['arg'];
             }
-            if( isset($matches['len'])) {
+            if (isset($matches['len'])) {
                 $return['len'] = $matches['len'];
             }
-            if( isset($matches['scale'])) {
+            if (isset($matches['scale'])) {
                 $return['scale'] = $matches['scale'];
             }
             return $return;
@@ -2442,28 +2442,28 @@ 
 		$type = $this->getFieldType($fieldDef);
         $colType = $this->getColumnType($type);
 
-        if($parts = $this->getTypeParts($colType))
+        if ($parts = $this->getTypeParts($colType))
         {
             $colBaseType = $parts['baseType'];
-            $defLen =  isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
+            $defLen = isset($parts['len']) ? $parts['len'] : '255'; // Use the mappings length (precision) as default if it exists
         }
 
-        if(!empty($fieldDef['len'])) {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
+        if (!empty($fieldDef['len'])) {
+            if (in_array($colBaseType, array('nvarchar', 'nchar', 'varchar', 'varchar2', 'char',
                                           'clob', 'blob', 'text'))) {
           	    $colType = "$colBaseType(${fieldDef['len']})";
-            } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
-                          $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
+            } elseif (($colBaseType == 'decimal' || $colBaseType == 'float')) {
+                  if (!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
+                      if (strpos($fieldDef['len'], ',') === false) {
+                          $colType = $colBaseType."(".$fieldDef['len'].",".$fieldDef['precision'].")";
+                      } else {
+                          $colType = $colBaseType."(".$fieldDef['len'].")";
                       }
                   else
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
+                          $colType = $colBaseType."(".$fieldDef['len'].")";
               }
         } else {
-            if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
+            if (in_array($colBaseType, array('nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
                 $colType = "$colBaseType($defLen)";
             }
         }
@@ -2485,29 +2485,29 @@ 
         }
 
 		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		if (!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
+			$auto_increment = $this->setAutoIncrement($table, $fieldDef['name']);
 
-		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
+		$required = 'NULL'; // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
 		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
 		if ((empty($fieldDef['isnull']) || strtolower($fieldDef['isnull']) == 'false') &&
 			(!empty($auto_increment) || $name == 'id' || ($fieldDef['type'] == 'id' && !empty($fieldDef['required'])))) {
-			$required =  "NOT NULL";
+			$required = "NOT NULL";
 		}
 		// If the field is marked both required & isnull=>false - alwqys make it not null
 		// Use this to ensure primary key fields never defined as null
-		if(isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
+		if (isset($fieldDef['isnull']) && (strtolower($fieldDef['isnull']) == 'false' || $fieldDef['isnull'] === false)
 			&& !empty($fieldDef['required'])) {
-			$required =  "NOT NULL";
+			$required = "NOT NULL";
 		}
 		if ($ignoreRequired)
 			$required = "";
 
-		if ( $return_as_array ) {
+		if ($return_as_array) {
 			return array(
 				'name' => $name,
 				'colType' => $colType,
-                'colBaseType' => $colBaseType,  // Adding base type for easier processing in derived classes
+                'colBaseType' => $colBaseType, // Adding base type for easier processing in derived classes
 				'default' => $default,
 				'required' => $required,
 				'auto_increment' => $auto_increment,
@@ -2532,14 +2532,14 @@ 
 
 		if ($this->isFieldArray($fieldDefs)) {
 			foreach ($fieldDefs as $fieldDef) {
-				if(!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
-					$columns[] = $this->oneColumnSQLRep($fieldDef,false, $tablename);
+				if (!isset($fieldDef['source']) || $fieldDef['source'] == 'db') {
+					$columns[] = $this->oneColumnSQLRep($fieldDef, false, $tablename);
 				}
 			}
 			$columns = implode(",", $columns);
 		}
 		else {
-			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
+			$columns = $this->oneColumnSQLRep($fieldDefs, $ignoreRequired, $tablename);
 		}
 
 		return $columns;
@@ -2701,40 +2701,40 @@ 
      */
 	public function getValidDBName($name, $ensureUnique = false, $type = 'column', $force = false)
 	{
-		if(is_array($name)) {
+		if (is_array($name)) {
 			$result = array();
-			foreach($name as $field) {
+			foreach ($name as $field) {
 				$result[] = $this->getValidDBName($field, $ensureUnique, $type);
 			}
 			return $result;
 		} else {
-		    if(strchr($name, ".")) {
+		    if (strchr($name, ".")) {
 		        // this is a compound name with dots, handle separately
 		        $parts = explode(".", $name);
-		        if(count($parts) > 2) {
+		        if (count($parts) > 2) {
 		            // some weird name, cut to table.name
-		            array_splice($parts, 0, count($parts)-2);
+		            array_splice($parts, 0, count($parts) - 2);
 		        }
 		        $parts = $this->getValidDBName($parts, $ensureUnique, $type, $force);
                 return join(".", $parts);
 		    }
 			// first strip any invalid characters - all but word chars (which is alphanumeric and _)
-			$name = preg_replace( '/[^\w]+/i', '', $name ) ;
-			$len = strlen( $name ) ;
+			$name = preg_replace('/[^\w]+/i', '', $name);
+			$len = strlen($name);
 			$maxLen = empty($this->maxNameLengths[$type]) ? $this->maxNameLengths[$type]['column'] : $this->maxNameLengths[$type];
 			if ($len <= $maxLen && !$force) {
 				return strtolower($name);
 			}
 			if ($ensureUnique) {
 				$md5str = md5($name);
-				$tail = substr ( $name, -11) ;
-				$temp = substr($md5str , strlen($md5str)-4 );
-				$result = substr( $name, 0, 10) . $temp . $tail ;
+				$tail = substr($name, -11);
+				$temp = substr($md5str, strlen($md5str) - 4);
+				$result = substr($name, 0, 10).$temp.$tail;
 			} else {
-				$result = substr( $name, 0, 11) . substr( $name, 11 - $maxLen);
+				$result = substr($name, 0, 11).substr($name, 11 - $maxLen);
 			}
 
-			return strtolower( $result ) ;
+			return strtolower($result);
 		}
 	}
 
@@ -2746,7 +2746,7 @@ 
 	 */
 	public function getColumnType($type)
 	{
-		return isset($this->type_map[$type])?$this->type_map[$type]:$type;
+		return isset($this->type_map[$type]) ? $this->type_map[$type] : $type;
 	}
 
 	/**
@@ -2760,10 +2760,10 @@ 
 	 */
 	public function isFieldArray($defArray)
 	{
-		if ( !is_array($defArray) )
+		if (!is_array($defArray))
 			return false;
 
-		if ( isset($defArray['type']) ){
+		if (isset($defArray['type'])) {
 			// type key exists. May be an array of defs or a simple definition
 			return is_array($defArray['type']); // type is not an array => definition else array
 		}
@@ -2798,19 +2798,19 @@ 
 		require('metadata/audit_templateMetaData.php');
 		$fieldDefs = $dictionary['audit']['fields'];
 
-		$values=array();
+		$values = array();
 		$values['id'] = $this->massageValue(create_guid(), $fieldDefs['id']);
-		$values['parent_id']= $this->massageValue($bean->id, $fieldDefs['parent_id']);
-		$values['field_name']= $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
+		$values['parent_id'] = $this->massageValue($bean->id, $fieldDefs['parent_id']);
+		$values['field_name'] = $this->massageValue($changes['field_name'], $fieldDefs['field_name']);
 		$values['data_type'] = $this->massageValue($changes['data_type'], $fieldDefs['data_type']);
-		if ($changes['data_type']=='text') {
+		if ($changes['data_type'] == 'text') {
 			$values['before_value_text'] = $this->massageValue($changes['before'], $fieldDefs['before_value_text']);
 			$values['after_value_text'] = $this->massageValue($changes['after'], $fieldDefs['after_value_text']);
 		} else {
 			$values['before_value_string'] = $this->massageValue($changes['before'], $fieldDefs['before_value_string']);
 			$values['after_value_string'] = $this->massageValue($changes['after'], $fieldDefs['after_value_string']);
 		}
-		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created'] );
+		$values['date_created'] = $this->massageValue(TimeDate::getInstance()->nowDb(), $fieldDefs['date_created']);
 		$values['created_by'] = $this->massageValue($current_user->id, $fieldDefs['created_by']);
 
 		$sql .= "(".implode(",", array_keys($values)).") ";
@@ -2840,9 +2840,9 @@ 
      * @param array|null $field_filter Array of filter names to be inspected (NULL means all fields)
      * @return array
      */
-    public function getDataChanges(SugarBean &$bean, array $field_filter = null)
+    public function getDataChanges(SugarBean & $bean, array $field_filter = null)
 	{
-        $changed_values=array();
+        $changed_values = array();
 
         $fetched_row = array();
         if (is_array($bean->fetched_row))
@@ -2862,40 +2862,40 @@ 
             $field_defs = array_intersect_key($field_defs, $fetched_row);
 
             // remove fields which do not exist as bean property
-            $field_defs = array_intersect_key($field_defs, (array) $bean);
+            $field_defs = array_intersect_key($field_defs, (array)$bean);
 
             foreach ($field_defs as $field => $properties) {
                 $before_value = $fetched_row[$field];
-                $after_value=$bean->$field;
+                $after_value = $bean->$field;
                 if (isset($properties['type'])) {
-                    $field_type=$properties['type'];
+                    $field_type = $properties['type'];
                 } else {
                     if (isset($properties['dbType'])) {
-                        $field_type=$properties['dbType'];
+                        $field_type = $properties['dbType'];
                     }
-                    else if(isset($properties['data_type'])) {
-                        $field_type=$properties['data_type'];
+                    else if (isset($properties['data_type'])) {
+                        $field_type = $properties['data_type'];
                     }
                     else {
-                        $field_type=$properties['dbtype'];
+                        $field_type = $properties['dbtype'];
                     }
                 }
 
                 //Because of bug #25078(sqlserver haven't 'date' type, trim extra "00:00:00" when insert into *_cstm table).
                 // so when we read the audit datetime field from sqlserver, we have to replace the extra "00:00:00" again.
-                if(!empty($field_type) && $field_type == 'date'){
-                    $before_value = $this->fromConvert($before_value , $field_type);
+                if (!empty($field_type) && $field_type == 'date') {
+                    $before_value = $this->fromConvert($before_value, $field_type);
                 }
                 //if the type and values match, do nothing.
-                if (!($this->_emptyValue($before_value,$field_type) && $this->_emptyValue($after_value,$field_type))) {
+                if (!($this->_emptyValue($before_value, $field_type) && $this->_emptyValue($after_value, $field_type))) {
                     $change = false;
                     if (trim($before_value) !== trim($after_value)) {
                         // Bug #42475: Don't directly compare numeric values, instead do the subtract and see if the comparison comes out to be "close enough", it is necessary for floating point numbers.
                         // Manual merge of fix 95727f2eed44852f1b6bce9a9eccbe065fe6249f from DBHelper
                         // This fix also fixes Bug #44624 in a more generic way and therefore eliminates the need for fix 0a55125b281c4bee87eb347709af462715f33d2d in DBHelper
                         if ($this->isNumericType($field_type)) {
-                            $numerator = abs(2*((trim($before_value)+0)-(trim($after_value)+0)));
-                            $denominator = abs(((trim($before_value)+0)+(trim($after_value)+0)));
+                            $numerator = abs(2 * ((trim($before_value) + 0) - (trim($after_value) + 0)));
+                            $denominator = abs(((trim($before_value) + 0) + (trim($after_value) + 0)));
                             // detect whether to use absolute or relative error. use absolute if denominator is zero to avoid division by zero
                             $error = ($denominator == 0) ? $numerator : $numerator / $denominator;
                             if ($error >= 0.0000000001) {    // Smaller than 10E-10
@@ -2911,7 +2911,7 @@ 
                             $change = true;
                         }
                         if ($change) {
-                            $changed_values[$field]=array('field_name'=>$field,
+                            $changed_values[$field] = array('field_name'=>$field,
                                 'data_type'=>$field_type,
                                 'before'=>$before_value,
                                 'after'=>$after_value);
@@ -2982,8 +2982,8 @@ 
      */
 	public function renameIndexDefs($old_definition, $new_definition, $table_name)
 	{
-		return array($this->add_drop_constraint($table_name,$old_definition,true),
-				$this->add_drop_constraint($table_name,$new_definition), false);
+		return array($this->add_drop_constraint($table_name, $old_definition, true),
+				$this->add_drop_constraint($table_name, $new_definition), false);
 	}
 
 	/**
@@ -3005,7 +3005,7 @@ 
 	protected function _getBooleanValue($val)
 	{
 		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
+		if (empty($val) or $val === 'off')
 			return false;
 
 		return true;
@@ -3018,7 +3018,7 @@ 
 	 */
 	public function isNumericType($type)
 	{
-	    if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+	    if (isset($this->type_class[$type]) && ($this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
 	        return true;
 	    }
 		return false;
@@ -3035,7 +3035,7 @@ 
 		if (empty($val))
 			return true;
 
-		if($this->emptyValue($type) == $val) {
+		if ($this->emptyValue($type) == $val) {
 			return true;
 		}
 		switch ($type) {
@@ -3094,7 +3094,7 @@ 
 		$i = 0;
 		$order_by_arr = array();
 		foreach ($values as $key => $value) {
-			if($key == '') {
+			if ($key == '') {
 				$order_by_arr[] = "WHEN ($order_by='' OR $order_by IS NULL) THEN $i";
 			} else {
 				$order_by_arr[] = "WHEN $order_by=".$this->quoted($key)." THEN $i";
@@ -3112,7 +3112,7 @@ 
      */
 	public function emptyValue($type)
 	{
-		if(isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
+		if (isset($this->type_class[$type]) && ($this->type_class[$type] == 'bool' || $this->type_class[$type] == 'int' || $this->type_class[$type] == 'float')) {
 			return 0;
 		}
 
@@ -3161,9 +3161,9 @@ 
      * @return resource|bool query result
      * @see DBManager::limitQuery()
 	 */
-	public function limitQuerySql($sql, $start, $count, $dieOnError=false, $msg='')
+	public function limitQuerySql($sql, $start, $count, $dieOnError = false, $msg = '')
 	{
-		return $this->limitQuery($sql,$start,$count,$dieOnError,$msg,false);
+		return $this->limitQuery($sql, $start, $count, $dieOnError, $msg, false);
 	}
 
 	/**
@@ -3182,7 +3182,7 @@ 
      */
 	public function checkPrivilege($privilege)
 	{
-		switch($privilege) {
+		switch ($privilege) {
 			case "CREATE TABLE":
 				$this->query("CREATE TABLE temp (id varchar(36))");
 				break;
@@ -3203,23 +3203,23 @@ 
 				break;
 			case "ADD COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 50));
-				$sql = 	$this->changeColumnSQL("temp", $test, "add");
+				$sql = $this->changeColumnSQL("temp", $test, "add");
 				$this->query($sql);
 				break;
 			case "CHANGE COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "modify");
+				$sql = $this->changeColumnSQL("temp", $test, "modify");
 				$this->query($sql);
 				break;
 			case "DROP COLUMN":
 				$test = array("test" => array("name" => "test", "type" => "varchar", "len" => 100));
-				$sql = 	$this->changeColumnSQL("temp", $test, "drop");
+				$sql = $this->changeColumnSQL("temp", $test, "drop");
 				$this->query($sql);
 				break;
 			default:
 				return false;
 		}
-		if($this->checkError("Checking privileges")) {
+		if ($this->checkError("Checking privileges")) {
 			return false;
 		}
 		return true;
@@ -3236,7 +3236,7 @@ 
 		$select_check = strpos(strtolower($query), strtolower("SELECT"));
 		//Checks to see if there is union select which is valid
 		$select_check2 = strpos(strtolower($query), strtolower("(SELECT"));
-		if($select_check==0 || $select_check2==0){
+		if ($select_check == 0 || $select_check2 == 0) {
 			//Returning false means query is ok!
 			return true;
 		}
@@ -3255,10 +3255,10 @@ 
 	public function parseFulltextQuery($query)
 	{
 		/* split on space or comma, double quotes with \ for escape */
-		if(strpbrk($query, " ,")) {
+		if (strpbrk($query, " ,")) {
 			// ("([^"]*?)"|[^" ,]+)((, )+)?
 			// '/([^" ,]+|".*?[^\\\\]")(,|\s)\s*/'
-			if(!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
+			if (!preg_match_all('/("([^"]*?)"|[^"\s,]+)((,\s)+)?/', $query, $m)) {
 				return false;
 			}
 			$qterms = $m[1];
@@ -3266,17 +3266,17 @@ 
 			$qterms = array($query);
 		}
 		$terms = $must_terms = $not_terms = array();
-		foreach($qterms as $item) {
-			if($item[0] == '"') {
+		foreach ($qterms as $item) {
+			if ($item[0] == '"') {
 				$item = trim($item, '"');
 			}
-			if($item[0] == '+') {
+			if ($item[0] == '+') {
                 if (strlen($item) > 1) {
                     $must_terms[] = substr($item, 1);
                 }
                 continue;
 			}
-			if($item[0] == '-') {
+			if ($item[0] == '-') {
                 if (strlen($item) > 1) {
 				    $not_terms[] = substr($item, 1);
                 }
@@ -3325,11 +3325,11 @@ 
 	public function verifySQLStatement($query, $skipTables)
 	{
 		$query = trim($query);
-		foreach($this->standardQueries as $qstart => $check) {
-			if(strncasecmp($qstart, $query, strlen($qstart)) == 0) {
-				if(is_callable(array($this, $check))) {
+		foreach ($this->standardQueries as $qstart => $check) {
+			if (strncasecmp($qstart, $query, strlen($qstart)) == 0) {
+				if (is_callable(array($this, $check))) {
 					$table = $this->extractTableName($query);
-					if(!in_array($table, $skipTables)) {
+					if (!in_array($table, $skipTables)) {
 						return call_user_func(array($this, $check), $table, $query);
 					} else {
 						$this->log->debug("Skipping table $table as blacklisted");
@@ -3358,20 +3358,20 @@ 
 		$tempname = $table."__uw_temp";
 		$tempTableQuery = str_replace("CREATE TABLE {$table}", "CREATE TABLE $tempname", $query);
 
-		if(strpos($tempTableQuery, '__uw_temp') === false) {
+		if (strpos($tempTableQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
 		$this->query($tempTableQuery, false, "Preflight Failed for: {$query}");
 
 		$error = $this->lastError(); // empty on no-errors
-		if(!empty($error)) {
+		if (!empty($error)) {
 			return $error;
 		}
 
 		// check if table exists
 		$this->log->debug('testing for table: '.$table);
-		if(!$this->tableExists($tempname)) {
+		if (!$this->tableExists($tempname)) {
 			return "Failed to create temp table!";
 		}
 
@@ -3390,8 +3390,8 @@ 
 	public function queryArray(array $sqls, $dieOnError = false, $msg = '', $suppress = false)
 	{
 		$last = true;
-		foreach($sqls as $sql) {
-			if(!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
+		foreach ($sqls as $sql) {
+			if (!($last = $this->query($sql, $dieOnError, $msg, $suppress))) {
 				break;
 			}
 		}
@@ -3409,7 +3409,7 @@ 
 	{
 	    if (empty($result))	return false;
 
-	    if(is_int($encode) && func_num_args() == 3) {
+	    if (is_int($encode) && func_num_args() == 3) {
 	        // old API: $result, $rowNum, $encode
 	        $GLOBALS['log']->deprecated("Using row number in fetchByAssoc is not portable and no longer supported. Please fix your code.");
 	        $encode = func_get_arg(2);
@@ -3460,7 +3460,7 @@ 
 	 */
 	public function getOption($option)
 	{
-	    if(isset($this->options[$option])) {
+	    if (isset($this->options[$option])) {
 	        return $this->options[$option];
 	    }
 	    return null;
@@ -3500,7 +3500,7 @@ 
 	public function isDatabaseNameValid($name)
 	{
 		// Generic case - no slashes, no dots
-		return preg_match('#[/.\\\\]#', $name)==0;
+		return preg_match('#[/.\\\\]#', $name) == 0;
 	}
 
 	/**

Braces +276 added lines, -198 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -403,13 +405,15 @@ 
 	$match = array();
 	preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
 	$indices = false;
-	if (!empty($match[1][0]))
-		$table = $match[1][0];
-	else
-		return false;
+	if (!empty($match[1][0])) {
+			$table = $match[1][0];
+	} else {
+			return false;
+	}
 
-	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
-		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
+	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name])) {
+			$indices = $GLOBALS['dictionary'][$object_name]['indices'];
+	}
 
 	if (empty($indices)) {
 		foreach ( $GLOBALS['dictionary'] as $current ) {
@@ -427,25 +431,29 @@ 
 		$orderBys = explode(' ', $match[2][0]);
 		foreach ($orderBys as $orderBy){
 			$orderBy = trim($orderBy);
-			if (empty($orderBy))
-				continue;
+			if (empty($orderBy)) {
+							continue;
+			}
 			$orderBy = strtolower($orderBy);
-			if ($orderBy == 'asc' || $orderBy == 'desc')
-				continue;
+			if ($orderBy == 'asc' || $orderBy == 'desc') {
+							continue;
+			}
 
 			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
 
-			foreach ($indices as $index)
-				if (empty($index['db']) || $index['db'] == $this->dbType)
+			foreach ($indices as $index) {
+							if (empty($index['db']) || $index['db'] == $this->dbType)
 					foreach ($index['fields'] as $field)
 						if ($field == $orderBy)
 							return true;
+			}
 
 			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
-			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
-			else
-				$this->log->warn('CHECK QUERY:' .$warning);
+			if (!empty($GLOBALS['sugar_config']['dump_slow_queries'])) {
+							$this->log->fatal('CHECK QUERY:' .$warning);
+			} else {
+							$this->log->warn('CHECK QUERY:' .$warning);
+			}
 		}
 	}
 	return false;
@@ -467,8 +475,9 @@ 
 	public function checkConnection()
 	{
 		$this->last_error = '';
-		if (!isset($this->database))
-			$this->connect();
+		if (!isset($this->database)) {
+					$this->connect();
+		}
 	}
 
 	/**
@@ -510,9 +519,13 @@ 
 		$values = array();
 		foreach ($field_defs as $field => $fieldDef)
 		{
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db') {
+			    continue;
+			}
 			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) {
+			    continue;
+			}
 
 			if(isset($data[$field])) {
 				// clean the incoming value..
@@ -541,8 +554,10 @@ 
 			}
 		}
 
-		if (empty($values))
-			return $execute?true:''; // no columns set
+		if (empty($values)) {
+					return $execute?true:'';
+		}
+		// no columns set
 
 		// get the entire sql
 		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
@@ -642,9 +657,10 @@ 
 		if(!$this->supports("inline_keys")) {
 		// handle constraints and indices
 			$indicesArr = $this->createConstraintSql($bean);
-			if (count($indicesArr) > 0)
-				foreach ($indicesArr as $indexSql)
+			if (count($indicesArr) > 0) {
+							foreach ($indicesArr as $indexSql)
 					$this->query($indexSql, true, $msg);
+			}
 		}
 	}
 
@@ -681,9 +697,10 @@ 
 			if(!$this->supports("inline_keys")) {
 				// handle constraints and indices
 				$indicesArr = $this->getConstraintSql($indices, $tablename);
-				if (count($indicesArr) > 0)
-					foreach ($indicesArr as $indexSql)
+				if (count($indicesArr) > 0) {
+									foreach ($indicesArr as $indexSql)
 						$res = ($res and $this->query($indexSql, true, "Error creating indexes"));
+				}
 			}
 			return $res;
 		}
@@ -710,13 +727,15 @@ 
 		}
 		//jc: added this for beans that do not actually have a table, namely
 		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
-			return '';
+		if($tablename == 'does_not_exist' || $tablename == '') {
+					return '';
+		}
 
 		global $dictionary;
 		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
+		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) ) {
+					$engine = $dictionary[$bean->getObjectName()]['engine'];
+		}
 
 		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
 	}
@@ -760,8 +779,9 @@ 
 	{
 		//jc: had a bug when running the repair if the tablename is blank the repair will
 		//fail when it tries to create a repair table
-		if ($tablename == '' || empty($fielddefs))
-			return '';
+		if ($tablename == '' || empty($fielddefs)) {
+					return '';
+		}
 
 		//if the table does not exist create it and we are done
 		$sql = "/* Table : $tablename */\n";
@@ -784,16 +804,16 @@ 
 		// do column comparisons
 		$sql .=	"/*COLUMNS*/\n";
 		foreach ($fielddefs as $name => $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+			if (isset($value['source']) && $value['source'] != 'db') {
+							continue;
+			}
 
             // Bug #42406. Skipping breaked vardef without type or name
             if (isset($value['name']) == false || $value['name'] == false)
             {
                 $sql .= "/* NAME IS MISSING IN VARDEF $tablename::$name */\n";
                 continue;
-            }
-            else if (isset($value['type']) == false || $value['type'] == false)
+            } else if (isset($value['type']) == false || $value['type'] == false)
             {
                 $sql .= "/* TYPE IS MISSING IN VARDEF $tablename::$name */\n";
                 continue;
@@ -823,8 +843,9 @@ 
 				// ok we need this field lets create it
 				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
 				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
-				if ($execute)
-					$this->addColumn($tablename, $value);
+				if ($execute) {
+									$this->addColumn($tablename, $value);
+				}
 				$take_action = true;
 			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
 				//fields are different lets alter it
@@ -880,8 +901,9 @@ 
 		unset($compareIndices_case_insensitive);
 
 		foreach ($indices as $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+			if (isset($value['source']) && $value['source'] != 'db') {
+							continue;
+			}
 
 
 			$validDBName = $this->getValidDBName($value['name'], true, 'index', true);
@@ -891,19 +913,23 @@ 
 		    $name = strtolower($value['name']);
 
 			//Don't attempt to fix the same index twice in one pass;
-			if (isset($correctedIndexs[$name]))
-				continue;
+			if (isset($correctedIndexs[$name])) {
+							continue;
+			}
 
 			//don't bother checking primary nothing we can do about them
-			if (isset($value['type']) && $value['type'] == 'primary')
-				continue;
+			if (isset($value['type']) && $value['type'] == 'primary') {
+							continue;
+			}
 
 			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
-				continue;
+			if ($value['type']=='fulltext') {
+							continue;
+			}
 
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
-				$value['type'] = 'index';
+			if ( in_array($value['type'],array('alternate_key','foreign')) ) {
+							$value['type'] = 'index';
+			}
 
 			if ( !isset($compareIndices[$name]) ) {
 				//First check if an index exists that doesn't match our name, if so, try to rename it
@@ -934,21 +960,23 @@ 
 				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
 				foreach ($compareIndices[$name] as $n1 => $t1) {
 					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
+					if ( $n1 == 'fields' ) {
+											foreach($t1 as $rKey => $rValue)
 							$sql .= "[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
+					} else {
+											$sql .= " $t1 ";
+					}
 				}
 				$sql .=	"*/\n";
 				$sql .=	"/* VARDEF - $name -  ROW";
 				foreach ($value as $n1 => $t1) {
 					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
-						foreach ($t1 as $rKey => $rValue)
+					if ( $n1 == 'fields' ) {
+											foreach ($t1 as $rKey => $rValue)
 							$sql .=	"[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
+					} else {
+											$sql .= " $t1 ";
+					}
 				}
 				$sql .=	"*/\n";
 				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
@@ -971,8 +999,9 @@ 
 	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
 	{
 		foreach ( $fielddef1 as $key => $value ) {
-			if ($key == 'name' && $ignoreName)
-				continue;
+			if ($key == 'name' && $ignoreName) {
+							continue;
+			}
             if (isset($fielddef2[$key]))
             {
                 if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
@@ -981,8 +1010,7 @@ 
                     {
                         continue;
                     }
-                }
-                else
+                } else
                 {
                     if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower',$fielddef2[$key]))
                     {
@@ -991,8 +1019,9 @@ 
                 }
             }
 			//Ignore len if its not set in the vardef
-			if ($key == 'len' && empty($fielddef2[$key]))
-				continue;
+			if ($key == 'len' && empty($fielddef2[$key])) {
+							continue;
+			}
             // if the length in db is greather than the vardef, ignore it
             if ($key == 'len' && ($fielddef1[$key] >= $fielddef2[$key])) {
                 continue;
@@ -1026,12 +1055,10 @@ 
 			if (!$row2) {
 				// Exists on table1 but not table2
 				$returnArray['msg'] = 'not_exists_table2';
-			}
-			else {
+			} else {
 				if (sizeof($row1) != sizeof($row2)) {
 					$returnArray['msg'] = 'no_match';
-				}
-				else {
+				} else {
 					$returnArray['msg'] = 'match';
 					foreach($row1 as $key => $value){
 						//ignore keys when checking we will check them when we do the index check
@@ -1041,8 +1068,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$returnArray['msg'] = 'not_exists_table1';
 		}
 
@@ -1122,16 +1148,19 @@ 
 	 */
 	public function getConstraintSql($indices, $table)
 	{
-		if (!$this->isFieldArray($indices))
-			$indices = array($indices);
+		if (!$this->isFieldArray($indices)) {
+					$indices = array($indices);
+		}
 
 		$columns = array();
 
 		foreach ($indices as $index) {
-			if(!empty($index['db']) && $index['db'] != $this->dbType)
-				continue;
-			if (isset($index['source']) && $index['source'] != 'db')
-			continue;
+			if(!empty($index['db']) && $index['db'] != $this->dbType) {
+							continue;
+			}
+			if (isset($index['source']) && $index['source'] != 'db') {
+						continue;
+			}
 
 			$sql = $this->add_drop_constraint($table, $index);
 
@@ -1221,11 +1250,11 @@ 
 		$sql = $this->addColumnSQL($tablename, $fieldDefs);
 		if ($this->isFieldArray($fieldDefs)){
 			$columns = array();
-			foreach ($fieldDefs as $fieldDef)
-				$columns[] = $fieldDef['name'];
+			foreach ($fieldDefs as $fieldDef) {
+							$columns[] = $fieldDef['name'];
+			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $fieldDefs['name'];
 		}
 		$msg = "Error adding column(s) $columns on table: $tablename:";
@@ -1249,8 +1278,7 @@ 
 				$columns[] = $fieldDef['name'];
 			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $newFieldDef['name'];
 		}
 
@@ -1370,7 +1398,9 @@ 
 			if(!$is_related_query){
 				foreach ($fields as $fieldDef)
 				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') {
+					    continue;
+					}
 					$val = $row[$fieldDef['name']];
 
 					//handle auto increment values here only need to do this on insert not create
@@ -1379,8 +1409,7 @@ 
 							if(!$built_columns){
 							$columns[] = 'deleted';
 						}
-					}
-					else
+					} else
 					{
 						$type = $fieldDef['type'];
 						if(!empty($fieldDef['custom_type'])){
@@ -1388,28 +1417,32 @@ 
 						}
 						// need to do some thing about types of values
 						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_values[$fieldDef['name']] = 'null';
-							else
-								$values[$fieldDef['name']] = 'null';
-						}else{
+							if(!empty($custom_fields[$fieldDef['name']])) {
+															$cstm_values[$fieldDef['name']] = 'null';
+							} else {
+															$values[$fieldDef['name']] = 'null';
+							}
+						} else{
 							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-								else
-									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								if(!empty($custom_fields[$fieldDef['name']])) {
+																	$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								} else {
+																	$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								}
 							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-								else
-									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								if(!empty($custom_fields[$fieldDef['name']])) {
+																	$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								} else {
+																	$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								}
 							}
 						}
 						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_columns[] = $fieldDef['name'];
-							else
-								$columns[] = $fieldDef['name'];
+							if(!empty($custom_fields[$fieldDef['name']])) {
+															$cstm_columns[] = $fieldDef['name'];
+							} else {
+															$columns[] = $fieldDef['name'];
+							}
 						}
 					}
 
@@ -1624,7 +1657,9 @@ 
 		    $queryresult = $this->query($sql, $dieOnError, $msg);
 		}
 		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
-		if (!$queryresult) return false;
+		if (!$queryresult) {
+		    return false;
+		}
 		$row = $this->fetchByAssoc($queryresult);
 		if(!empty($row)) {
 			return array_shift($row);
@@ -1648,10 +1683,14 @@ 
 		$queryresult = $this->query($sql, $dieOnError, $msg);
 		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
 
-		if (!$queryresult) return false;
+		if (!$queryresult) {
+		    return false;
+		}
 
 		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
+		if ( !$row ) {
+		    return false;
+		}
 
 		$this->freeResult($queryresult);
 		return $row;
@@ -1708,13 +1747,15 @@ 
 	protected function describeField($name, $tablename)
 	{
 		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
-			return 	$table[$name];
+		if(!empty($table) && isset($table[$name])) {
+					return 	$table[$name];
+		}
 
 		$table = $this->getTableDescription($tablename, true);
 
-		if(isset($table[$name]))
-		return $table[$name];
+		if(isset($table[$name])) {
+				return $table[$name];
+		}
 
 		return array();
 	}
@@ -1768,11 +1809,15 @@ 
      */
 	public function concat($table, array $fields, $space = ' ')
 	{
-		if(empty($fields)) return '';
+		if(empty($fields)) {
+		    return '';
+		}
 		$elems = array();
 		$space = $this->quoted($space);
 		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
+			if(!empty($elems)) {
+			    $elems[] = $space;
+			}
 			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
 		}
 		$first = array_shift($elems);
@@ -1864,7 +1909,7 @@ 
 				}//switch
 			}//foreach
 			return $this->query($query);
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -1926,20 +1971,30 @@ 
         $fields = $bean->getFieldDefinitions();
 		// get column names and values
 		foreach ($fields as $field => $fieldDef) {
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db') {
+			    continue;
+			}
 			// Do not write out the id field on the update statement.
     		// We are not allowed to change ids.
-    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
+    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) {
+    		    continue;
+    		}
 
     		// If the field is an auto_increment field, then we shouldn't be setting it.  This was added
     		// specially for Bugs and Cases which have a number associated with them.
-    		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
+    		if (!empty($bean->field_name_map[$field]['auto_increment'])) {
+    		    continue;
+    		}
 
     		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type'])) {
+    		    continue;
+    		}
 
     		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) {
+    		    continue;
+    		}
 
     		if(isset($bean->$field)) {
     			$val = from_html($bean->$field);
@@ -1972,8 +2027,10 @@ 
     		}
 		}
 
-		if ( sizeof($columns) == 0 )
-			return ""; // no columns set
+		if ( sizeof($columns) == 0 ) {
+					return "";
+		}
+		// no columns set
 
 		// build where clause
 		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
@@ -2039,8 +2096,9 @@ 
 			$where[] = " $table.$name $op $val";
 		}
 
-		if (!empty($where))
-			return implode(" AND ", $where);
+		if (!empty($where)) {
+					return implode(" AND ", $where);
+		}
 
 		return '';
 	}
@@ -2144,21 +2202,25 @@ 
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
 		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
-				$fieldDef['dbType'] = $fieldDef['dbtype'];
-			else
-				$fieldDef['dbType'] = $fieldDef['type'];
+			if ( isset($fieldDef['dbtype']) ) {
+							$fieldDef['dbType'] = $fieldDef['dbtype'];
+			} else {
+							$fieldDef['dbType'] = $fieldDef['type'];
+			}
 		}
 		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
 		$matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
-			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
-			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
-			$fieldDef['len'] .= ",{$fieldDef['precision']}";
+		if ( isset($matches[1][0]) ) {
+					$fieldDef['type'] = $matches[1][0];
+		}
+		if ( isset($matches[2][0]) && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = $matches[2][0];
+		}
+		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') ) {
+					$fieldDef['len'] .= ",{$fieldDef['precision']}";
+		}
 		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
 			$fieldDef['required'] = 'true';
 		}
@@ -2172,8 +2234,9 @@ 
 	public function getSelectFieldsFromQuery($selectStatement)
 	{
 		$selectStatement = trim($selectStatement);
-		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
-			$selectStatement = trim(substr($selectStatement, 6));
+		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT") {
+					$selectStatement = trim(substr($selectStatement, 6));
+		}
 
 		//Due to sql functions existing in many selects, we can't use php explode
 		$fields = array();
@@ -2189,17 +2252,15 @@ 
 				$field = $this->getFieldNameFromSelect(trim($selectField));
 				$fields[$field] = $selectField;
 				$selectField = "";
-			}
-			else if ($char == "("){
+			} else if ($char == "("){
 				$level++;
 				$selectField .= $char;
-			}
-			else if($char == ")"){
+			} else if($char == ")"){
 				$level--;
 				$selectField .= $char;
 
 
-			}else{
+			} else{
 				$selectField .= $char;
 			}
 
@@ -2218,18 +2279,19 @@ 
 		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
 			$string = substr($string, 9);
 		}
-		if (stripos($string, " as ") !== false)
-			//"as" used for an alias
+		if (stripos($string, " as ") !== false) {
+					//"as" used for an alias
 			return trim(substr($string, strripos($string, " as ") + 4));
-		else if (strrpos($string, " ") != 0)
-			//Space used as a delimiter for an alias
+		} else if (strrpos($string, " ") != 0) {
+					//Space used as a delimiter for an alias
 			return trim(substr($string, strrpos($string, " ")));
-		else if (strpos($string, ".") !== false)
-			//No alias, but a table.field format was used
+		} else if (strpos($string, ".") !== false) {
+					//No alias, but a table.field format was used
 			return substr($string, strpos($string, ".") + 1);
-		else
-			//Give up and assume the whole thing is the field name
+		} else {
+					//Give up and assume the whole thing is the field name
 			return $string;
+		}
 	}
 
 	/**
@@ -2289,8 +2351,9 @@ 
 			$aliases[$tableName][] = $table;
 
 			// build part of select for this table
-			if (is_array($cols[$beanID]))
-				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+			if (is_array($cols[$beanID])) {
+							foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+			}
 
 			// build part of where clause
 			if (is_array($whereClause[$beanID])){
@@ -2322,7 +2385,10 @@ 
 		$separator = "";
 		$from = ''; $table_used_in_from = array();
 		foreach ($relations as $table1 => $rightsidearray){
-			if ($table_used_in_from[$table1]) continue; // table has been joined
+			if ($table_used_in_from[$table1]) {
+			    continue;
+			}
+			// table has been joined
 
 			$from .= $separator." ".$table1;
 			$table_used_in_from[$table1] = true;
@@ -2333,7 +2399,9 @@ 
 					//choose first alias that does not match
 					// we are doing this because of self joins.
 					// in case of self joins, the same table will have many aliases.
-					if ($table2 != $table1) break;
+					if ($table2 != $table1) {
+					    break;
+					}
 				}
 
 				$col = $tablearray['foreingColumn'];
@@ -2362,11 +2430,13 @@ 
 		$tablename = $bean->getTableName();
 		$columns = array();
 		// get column names
-		foreach ($fields as $fieldDef)
-			$columns[] = $fieldDef['name'];
+		foreach ($fields as $fieldDef) {
+					$columns[] = $fieldDef['name'];
+		}
 
-		if (empty($columns))
-			return "";
+		if (empty($columns)) {
+					return "";
+		}
 
 		$columns = implode(",", $columns);
 
@@ -2386,16 +2456,21 @@ 
 		// we do not have change a lot of existing code
 		// and add dbtype where type is being used for some special
 		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
-			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
-			return  $fieldDef['dbtype'];
-		if (!empty($fieldDef['type']))
-			return  $fieldDef['type'];
-		if (!empty($fieldDef['Type']))
-			return  $fieldDef['Type'];
-		if (!empty($fieldDef['data_type']))
-			return  $fieldDef['data_type'];
+		if(!empty($fieldDef['dbType'])) {
+					return  $fieldDef['dbType'];
+		}
+		if(!empty($fieldDef['dbtype'])) {
+					return  $fieldDef['dbtype'];
+		}
+		if (!empty($fieldDef['type'])) {
+					return  $fieldDef['type'];
+		}
+		if (!empty($fieldDef['Type'])) {
+					return  $fieldDef['Type'];
+		}
+		if (!empty($fieldDef['data_type'])) {
+					return  $fieldDef['data_type'];
+		}
 
 		return null;
 	}
@@ -2453,14 +2528,15 @@ 
                                           'clob', 'blob', 'text'))) {
           	    $colType = "$colBaseType(${fieldDef['len']})";
             } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
+                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision'])) {
+                                        if(strpos($fieldDef['len'],',') === false){
                           $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-                      }
-                  else
+                  }
+                      } else{
                           $colType = $colBaseType . "(".$fieldDef['len'].")";
+                      } else {
+                                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                  }
               }
         } else {
             if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
@@ -2474,19 +2550,18 @@ 
         if (!empty($fieldDef['no_default']))
         {
             // nothing to do
-        }
-        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
+        } elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
         {
             $default = " DEFAULT ".$this->quoted($fieldDef['default']);
-        }
-        elseif (!isset($default) && $type == 'bool')
+        } elseif (!isset($default) && $type == 'bool')
         {
             $default = " DEFAULT 0 ";
         }
 
 		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment']) {
+					$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		}
 
 		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
 		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
@@ -2500,8 +2575,9 @@ 
 			&& !empty($fieldDef['required'])) {
 			$required =  "NOT NULL";
 		}
-		if ($ignoreRequired)
-			$required = "";
+		if ($ignoreRequired) {
+					$required = "";
+		}
 
 		if ( $return_as_array ) {
 			return array(
@@ -2537,8 +2613,7 @@ 
 				}
 			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
 		}
 
@@ -2760,8 +2835,9 @@ 
 	 */
 	public function isFieldArray($defArray)
 	{
-		if ( !is_array($defArray) )
-			return false;
+		if ( !is_array($defArray) ) {
+					return false;
+		}
 
 		if ( isset($defArray['type']) ){
 			// type key exists. May be an array of defs or a simple definition
@@ -2872,11 +2948,9 @@ 
                 } else {
                     if (isset($properties['dbType'])) {
                         $field_type=$properties['dbType'];
-                    }
-                    else if(isset($properties['data_type'])) {
+                    } else if(isset($properties['data_type'])) {
                         $field_type=$properties['data_type'];
-                    }
-                    else {
+                    } else {
                         $field_type=$properties['dbtype'];
                     }
                 }
@@ -2901,13 +2975,11 @@ 
                             if ($error >= 0.0000000001) {    // Smaller than 10E-10
                                 $change = true;
                             }
-                        }
-                        else if ($this->isBooleanType($field_type)) {
+                        } else if ($this->isBooleanType($field_type)) {
                             if ($this->_getBooleanValue($before_value) != $this->_getBooleanValue($after_value)) {
                                 $change = true;
                             }
-                        }
-                        else {
+                        } else {
                             $change = true;
                         }
                         if ($change) {
@@ -3005,8 +3077,9 @@ 
 	protected function _getBooleanValue($val)
 	{
 		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
-			return false;
+		if (empty($val) or $val==='off') {
+					return false;
+		}
 
 		return true;
 	}
@@ -3032,8 +3105,9 @@ 
      */
 	protected function _emptyValue($val, $type)
 	{
-		if (empty($val))
-			return true;
+		if (empty($val)) {
+					return true;
+		}
 
 		if($this->emptyValue($type) == $val) {
 			return true;
@@ -3050,10 +3124,12 @@ 
 			case 'short':
 				return ($val == 0);
 			case 'date':
-				if ($val == '0000-00-00')
-					return true;
-				if ($val == 'NULL')
-					return true;
+				if ($val == '0000-00-00') {
+									return true;
+				}
+				if ($val == 'NULL') {
+									return true;
+				}
 				return false;
 		}
 
@@ -3407,7 +3483,9 @@ 
 	 */
 	public function fetchByAssoc($result, $encode = true)
 	{
-	    if (empty($result))	return false;
+	    if (empty($result)) {
+	        return false;
+	    }
 
 	    if(is_int($encode) && func_num_args() == 3) {
 	        // old API: $result, $rowNum, $encode

include/SugarEmailAddress/SugarEmailAddress.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -81,9 +81,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function SugarEmailAddress(){
+    public function SugarEmailAddress() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -99,16 +99,16 @@ 
      * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
-        if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
             if (empty($this->addresses) || !isset($_REQUEST['massupdate'])) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == "1") ? true : false;
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == "1") ? true : false;
 
                 $isPrimary = true;
-                for($i = 1; $i <= 10; $i++){
+                for ($i = 1; $i <= 10; $i++) {
                     $email = 'email'.$i;
-                    if(isset($bean->$email) && !empty($bean->$email)){
+                    if (isset($bean->$email) && !empty($bean->$email)) {
                         $opt_out_field = $email.'_opt_out';
                         $invalid_field = $email.'_invalid';
                         $field_optOut = (isset($bean->$opt_out_field)) ? $bean->$opt_out_field : $optOut;
@@ -119,8 +119,8 @@ 
                 }
             }
         }
-        $this->populateAddresses($bean->id, $bean->module_dir, array(),'');
-        if(isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
+        $this->populateAddresses($bean->id, $bean->module_dir, array(), '');
+        if (isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
             $this->populateLegacyFields($bean);
         }
     }
@@ -142,11 +142,11 @@ 
         return;
     }
 
-    function populateLegacyFields(&$bean){
+    function populateLegacyFields(&$bean) {
         $primary_found = false;
         $alternate_found = false;
         $alternate2_found = false;
-        foreach($this->addresses as $k=>$address) {
+        foreach ($this->addresses as $k=>$address) {
             if ($primary_found && $alternate_found)
                 break;
             if ($address['primary_address'] == 1 && !$primary_found) {
@@ -155,7 +155,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -192,27 +192,27 @@ 
         $args = func_get_args();
         return call_user_func_array(array($this, '_save'), $args);
     }
-    private function _save($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='', $in_workflow=false) {
-        if(empty($this->addresses) || $in_workflow){
-            $this->populateAddresses($id, $module, $new_addrs,$primary);
+    private function _save($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '', $in_workflow = false) {
+        if (empty($this->addresses) || $in_workflow) {
+            $this->populateAddresses($id, $module, $new_addrs, $primary);
         }
 
         //find all email addresses..
-        $current_links=array();
+        $current_links = array();
         // Need to correct this to handle the Employee/User split
         $module = $this->getCorrectedModule($module);
-        $q2="select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
+        $q2 = "select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
         $r2 = $this->db->query($q2);
-        while(($row2=$this->db->fetchByAssoc($r2)) != null ) {
-            $current_links[$row2['email_address_id']]=$row2;
+        while (($row2 = $this->db->fetchByAssoc($r2)) != null) {
+            $current_links[$row2['email_address_id']] = $row2;
         }
 
         $isConversion = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? true : false;
 
         if (!empty($this->addresses)) {
             // insert new relationships and create email address record, if they don't exist
-            foreach($this->addresses as $address) {
-                if(!empty($address['email_address'])) {
+            foreach ($this->addresses as $address) {
+                if (!empty($address['email_address'])) {
                     $guid = create_guid();
                     $emailId = isset($address['email_address_id'])
                         && isset($current_links[$address['email_address_id']])
@@ -220,14 +220,14 @@ 
                     $emailId = $this->AddUpdateEmailAddress($address['email_address'],
                                                             $address['invalid_email'],
                                                             $address['opt_out'],
-                                                            $emailId);// this will save the email address if not found
+                                                            $emailId); // this will save the email address if not found
 
                     //verify linkage and flags.
-                    $upd_eabr="";
+                    $upd_eabr = "";
                     if (isset($current_links[$emailId])) {
                         if (!$isConversion) { // do not update anything if this is for lead conversion
-                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address'] ) {
-                            $upd_eabr="UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
+                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address']) {
+                            $upd_eabr = "UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
                         }
 
                         unset($current_links[$emailId]);
@@ -258,13 +258,13 @@ 
         // for lead conversion, do not delete email addresses
         if (!empty($current_links) && !$isConversion) {
 
-            $delete="";
+            $delete = "";
             foreach ($current_links as $eabr) {
 
-                $delete.=empty($delete) ? "'".$this->db->quote($eabr['id']) . "' " : ",'" . $this->db->quote($eabr['id']) . "'";
+                $delete .= empty($delete) ? "'".$this->db->quote($eabr['id'])."' " : ",'".$this->db->quote($eabr['id'])."'";
             }
 
-            $eabr_unlink="update email_addr_bean_rel set deleted=1 where id in ({$delete})";
+            $eabr_unlink = "update email_addr_bean_rel set deleted=1 where id in ({$delete})";
             $this->db->query($eabr_unlink);
         }
         $this->stateBeforeWorkflow = null;
@@ -286,7 +286,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -324,10 +324,10 @@ 
         $r = $this->db->query($q, true);
 
         $retArr = array();
-        while($a = $this->db->fetchByAssoc($r)) {
+        while ($a = $this->db->fetchByAssoc($r)) {
             $retArr[] = $a['bean_id'];
         }
-        if(count($retArr) > 0) {
+        if (count($retArr) > 0) {
             return $retArr;
         } else {
             return false;
@@ -347,7 +347,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -356,12 +356,12 @@ 
                 WHERE ea.email_address_caps = $emailCaps and eabl.deleted=0 ";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r)) {
-            if(isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
+        while ($a = $this->db->fetchByAssoc($r)) {
+            if (isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
                 $className = $beanList[$a['bean_module']];
 
-                if(isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
-                    if(!class_exists($className)) {
+                if (isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
+                    if (!class_exists($className)) {
                         require_once($beanFiles[$className]);
                     }
 
@@ -389,7 +389,7 @@ 
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
      */
-    function populateAddresses($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='') {
+    function populateAddresses($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '') {
         $module = $this->getCorrectedModule($module);
         //One last check for the ConvertLead action in which case we need to change $module to 'Leads'
         $module = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? 'Leads' : $module;
@@ -400,54 +400,54 @@ 
         $hasEmailValue = false;
         $email_ids = array();
 
-        if (isset($_REQUEST) && isset($_REQUEST[$module .'_email_widget_id'])) {
+        if (isset($_REQUEST) && isset($_REQUEST[$module.'_email_widget_id'])) {
 
             $fromRequest = false;
             // determine which array to process
-            foreach($_REQUEST as $k => $v) {
-                if(strpos($k, 'emailAddress') !== false) {
+            foreach ($_REQUEST as $k => $v) {
+                if (strpos($k, 'emailAddress') !== false) {
                    $fromRequest = true;
                    break;
                 }
-            $widget_id = $_REQUEST[$module .'_email_widget_id'];
+            $widget_id = $_REQUEST[$module.'_email_widget_id'];
     }
 
             //Iterate over the widgets for this module, in case there are multiple email widgets for this module
-            while(isset($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount]))
+            while (isset($_REQUEST[$module.$widget_id."emailAddress".$widgetCount]))
             {
-                if (empty($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount])) {
+                if (empty($_REQUEST[$module.$widget_id."emailAddress".$widgetCount])) {
                     $widgetCount++;
                     continue;
                 }
 
                 $hasEmailValue = true;
 
-                $eId = $module . $widget_id;
-                if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                $eId = $module.$widget_id;
+                if (isset($_REQUEST[$eId.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$eId.'emailAddressPrimaryFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$module.'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$eId.'emailAddressOptOutFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$module.'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$eId.'emailAddressInvalidFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$module.'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$eId.'emailAddressDeleteFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$module.'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -455,36 +455,36 @@ 
                 $replyToField = '';
                 $invalidField = '';
                 $optOutField = '';
-                if($fromRequest && empty($primary) && isset($primaryValue)) {
+                if ($fromRequest && empty($primary) && isset($primaryValue)) {
                     $primaryField = $primaryValue;
                 }
 
-                if($fromRequest && empty($replyTo)) {
-                    if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
-                    } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                if ($fromRequest && empty($replyTo)) {
+                    if (isset($_REQUEST[$eId.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$eId.'emailAddressReplyToFlag'];
+                    } else if (isset($_REQUEST[$module.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$module.'emailAddressReplyToFlag'];
                     }
                 }
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
                             $new_addrs[$k] = $v;
                         }
                     }
                 }
-                if($fromRequest && empty($email_ids)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($email_ids)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
                             $key = str_replace('emailAddressId', 'emailAddress', $k);
                             $email_ids[$key] = $v;
                         }
                     }
                 }
 
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
                               $new_addrs[$k] = $v;
@@ -493,21 +493,21 @@ 
                 }
 
                 //empty the addresses array if the post happened from email address widget.
-                if($post_from_email_address_widget) {
-                    $this->addresses=array();  //this gets populated during retrieve of the contact bean.
+                if ($post_from_email_address_widget) {
+                    $this->addresses = array(); //this gets populated during retrieve of the contact bean.
                 } else {
                     $optOutValues = array();
                     $invalidValues = array();
-                    foreach($new_addrs as $k=>$email) {
+                    foreach ($new_addrs as $k=>$email) {
                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
                        $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
+                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '".$this->db->quote(strtoupper($email))."'");
+                       if (!empty($result)) {
+                          $row = $this->db->fetchByAssoc($result);
+                          if (!empty($row['opt_out'])) {
                              $optOutValues[$k] = "emailAddress$count";
                           }
-                          if(!empty($row['invalid_email'])) {
+                          if (!empty($row['invalid_email'])) {
                              $invalidValues[$k] = "emailAddress$count";
                           }
                        }
@@ -515,11 +515,11 @@ 
                 }
                 // Re-populate the addresses class variable if we have new address(es).
                 if (!empty($new_addrs)) {
-                    foreach($new_addrs as $k => $reqVar) {
+                    foreach ($new_addrs as $k => $reqVar) {
                         //$key = preg_match("/^$eId/s", $k) ? substr($k, strlen($eId)) : $k;
                         $reqVar = trim($reqVar);
-                        if(strpos($k, 'emailAddress') !== false) {
-                            if(!empty($reqVar) && !in_array($k, $deleteValues)) {
+                        if (strpos($k, 'emailAddress') !== false) {
+                            if (!empty($reqVar) && !in_array($k, $deleteValues)) {
                                 $email_id   = (array_key_exists($k, $email_ids)) ? $email_ids[$k] : null;
                                 $primary    = ($k == $primaryValue) ? true : false;
                                 $replyTo    = ($k == $replyToField) ? true : false;
@@ -536,7 +536,7 @@ 
         }
 
         //If no widgets, set addresses array to empty
-        if($post_from_email_address_widget && !$hasEmailValue) {
+        if ($post_from_email_address_widget && !$hasEmailValue) {
            $this->addresses = array();
         }
     }
@@ -547,9 +547,9 @@ 
      * @param bool $primary Default false
      * @param bool $replyTo Default false
      */
-    function addAddress($addr, $primary=false, $replyTo=false, $invalid=false, $optOut=false, $email_id = null) {
+    function addAddress($addr, $primary = false, $replyTo = false, $invalid = false, $optOut = false, $email_id = null) {
         $addr = html_entity_decode($addr, ENT_QUOTES);
-        if(preg_match($this->regex, $addr)) {
+        if (preg_match($this->regex, $addr)) {
             $primaryFlag = ($primary) ? '1' : '0';
             $replyToFlag = ($replyTo) ? '1' : '0';
             $invalidFlag = ($invalid) ? '1' : '0';
@@ -585,17 +585,17 @@ 
      * Updates invalid_email and opt_out flags for each address
      */
     function updateFlags() {
-        if(!empty($this->addresses)) {
-            foreach($this->addresses as $addressMeta) {
-                if(isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
+        if (!empty($this->addresses)) {
+            foreach ($this->addresses as $addressMeta) {
+                if (isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
                     $address = $this->db->quote($this->_cleanAddress($addressMeta['email_address']));
 
                     $q = "SELECT * FROM email_addresses WHERE email_address = '{$address}'";
                     $r = $this->db->query($q);
                     $a = $this->db->fetchByAssoc($r);
 
-                    if(!empty($a)) {
-                        if(isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
+                    if (!empty($a)) {
+                        if (isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
                             $qUpdate = "UPDATE email_addresses SET invalid_email = ".intval($addressMeta['invalid_email']).", opt_out = ".intval($addressMeta['opt_out']).", date_modified = '".TimeDate::getInstance()->nowDb()."' WHERE id = '".$this->db->quote($a['id'])."'";
                             $rUpdate = $this->db->query($qUpdate);
                         }
@@ -608,7 +608,7 @@ 
     public function splitEmailAddress($addr)
     {
         $email = $this->_cleanAddress($addr);
-        if(!preg_match($this->regex, $email)) {
+        if (!preg_match($this->regex, $email)) {
             $email = ''; // remove bad email addr
         }
         $name = trim(str_replace(array($email, '<', '>', '"', "'"), '', $addr));
@@ -624,8 +624,8 @@ 
     function _cleanAddress($addr) {
         $addr = trim(from_html($addr));
 
-        if(strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
-            $address = trim(substr($addr, strrpos($addr, "<") +1, strrpos($addr, ">") - strrpos($addr, "<") -1));
+        if (strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
+            $address = trim(substr($addr, strrpos($addr, "<") + 1, strrpos($addr, ">") - strrpos($addr, "<") - 1));
         } else {
             $address = trim($addr);
         }
@@ -646,11 +646,11 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(!empty($a) && !empty($a['id'])) {
+        if (!empty($a) && !empty($a['id'])) {
             return $a['id'];
         } else {
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted)
@@ -672,7 +672,7 @@ 
      *        to propagate to the new SugarEmailAddress - see bug 39188
      * @return String GUID of Email Address or '' if cleaned address was empty.
      */
-    public function AddUpdateEmailAddress($addr,$invalid=0,$opt_out=0,$id=null)
+    public function AddUpdateEmailAddress($addr, $invalid = 0, $opt_out = 0, $id = null)
     {
         // sanity checks to avoid SQL injection.
         $invalid = intval($invalid);
@@ -722,12 +722,12 @@ 
             if ($duplicate_email['invalid_email'] != $new_invalid ||
                 $duplicate_email['opt_out'] != $new_opt_out ||
                 (trim($duplicate_email['email_address']) != $address)) {
-                $upd_q = 'UPDATE ' . $this->table_name . ' ' .
-                    'SET email_address=\'' . $address . '\', ' .
-                    'invalid_email=' . $new_invalid . ', ' .
-                    'opt_out=' . $new_opt_out . ', ' .
-                    'date_modified=' . $this->db->now() . ' ' .
-                    'WHERE id=\'' . $this->db->quote($duplicate_email['id']) . '\'';
+                $upd_q = 'UPDATE '.$this->table_name.' '.
+                    'SET email_address=\''.$address.'\', '.
+                    'invalid_email='.$new_invalid.', '.
+                    'opt_out='.$new_opt_out.', '.
+                    'date_modified='.$this->db->now().' '.
+                    'WHERE id=\''.$this->db->quote($duplicate_email['id']).'\'';
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
@@ -735,7 +735,7 @@ 
         else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted, invalid_email, opt_out)
@@ -751,12 +751,12 @@ 
      * @param object $focus Object in focus
      * @return string email
      */
-    function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
+    function getPrimaryAddress($focus, $parent_id = null, $parent_type = null) {
 
-        $parent_type=empty($parent_type) ? $focus->module_dir : $parent_type;
+        $parent_type = empty($parent_type) ? $focus->module_dir : $parent_type;
         // Bug63174: Email address is not shown in the list view for employees
         $parent_type = $this->getCorrectedModule($parent_type);
-        $parent_id=empty($parent_id) ? $focus->id : $parent_id;
+        $parent_id = empty($parent_id) ? $focus->id : $parent_id;
 
         $q = "SELECT ea.email_address FROM email_addresses ea
                 LEFT JOIN email_addr_bean_rel ear ON ea.id = ear.email_address_id
@@ -768,7 +768,7 @@ 
         $r = $this->db->limitQuery($q, 0, 1);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -809,7 +809,7 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -834,7 +834,7 @@ 
                 ORDER BY ear.reply_to_address, ear.primary_address DESC";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r, FALSE)) {
+        while ($a = $this->db->fetchByAssoc($r, FALSE)) {
             $return[] = $a;
         }
 
@@ -848,9 +848,9 @@ 
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
+    function getEmailAddressWidgetEditView($id, $module, $asMetadata = false, $tpl = '', $tabindex = '0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings, $dictionary, $beanList;
@@ -861,33 +861,33 @@ 
         $passedModule = $module;
         $module = $this->getCorrectedModule($module);
         $saveModule = $module;
-        if(isset($_POST['is_converted']) && $_POST['is_converted']==true){
-            $id=$_POST['return_id'];
-            $module=$_POST['return_module'];
+        if (isset($_POST['is_converted']) && $_POST['is_converted'] == true) {
+            $id = $_POST['return_id'];
+            $module = $_POST['return_module'];
         }
         $prefillDataArr = array();
-        if(!empty($id)) {
+        if (!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
             if (empty($prefillDataArr) && $module == "Contacts")
                 $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
-        } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
-            $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
+        } else if (isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])) {
+            $widget_id = isset($_REQUEST[$module.'_email_widget_id']) ? $_REQUEST[$module.'_email_widget_id'] : '0';
             $count = 0;
-            $key = $module . $widget_id . 'emailAddress'.$count;
-            while(isset($_REQUEST[$key])) {
+            $key = $module.$widget_id.'emailAddress'.$count;
+            while (isset($_REQUEST[$key])) {
                    $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
+                   $prefillDataArr[] = array('email_address'=>$email,
                                              'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
                                              'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
                                              'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
                                              'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                   $key = $module.$widget_id.'emailAddress'.++$count;
             } //while
         }
 
-        if(!empty($prefillDataArr)) {
+        if (!empty($prefillDataArr)) {
             $json = new JSON(JSON_LOOSE_TYPE);
             $prefillData = $json->encode($prefillDataArr);
             $prefill = !empty($prefillDataArr) ? 'true' : 'false';
@@ -910,23 +910,23 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
+        if ($this->view == "QuickCreate") {
             // Fixed #1120 - fixed email validation for: Accounts -> Contacts subpanel -> Select -> Create Contact -> Save.
             // If email is required it should highlight this field and show an error message.
             // It didnt because the the form was named form_DCSubpanelQuickCreate_Contacts instead of expected form_SubpanelQuickCreate_Contacts
-            if($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
-                $form = 'form_'.$this->view .'_'.$module;
+            if ($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
+                $form = 'form_'.$this->view.'_'.$module;
             } else {
-                $form = 'form_DC'.$this->view .'_'.$module;
+                $form = 'form_DC'.$this->view.'_'.$module;
             }
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+            if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'SubpanelCreates' || $_REQUEST['action'] == 'SubpanelEdits') {
+                $form = 'form_Subpanel'.$this->view.'_'.$module;
             }
         }
 
         $this->smarty->assign('emailView', $form);
 
-        if($module == 'Users') {
+        if ($module == 'Users') {
             $this->smarty->assign('useReplyTo', true);
         } else {
             $this->smarty->assign('useOptOut', true);
@@ -937,7 +937,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -955,18 +955,18 @@ 
      * @param object $focus Bean in focus
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetDetailView($focus, $tpl='')
+    function getEmailAddressWidgetDetailView($focus, $tpl = '')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if (empty($focus->id))return '';
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
-        foreach($prefillData as $addressItem) {
+        foreach ($prefillData as $addressItem) {
             $key = ($addressItem['primary_address'] == 1) ? 'primary' : "";
             $key = ($addressItem['reply_to_address'] == 1) ? 'reply_to' : $key;
             $key = ($addressItem['opt_out'] == 1) ? 'opt_out' : $key;
@@ -992,7 +992,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -1002,49 +1002,49 @@ 
         $invalid = array();
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $this->smarty->assign('email_widget_id',$widget_id);
-        $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $this->smarty->assign('email_widget_id', $widget_id);
+        $this->smarty->assign('emailAddressWidget', $_POST['emailAddressWidget']);
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+        if (isset($_POST[$mod.$widget_id.'emailAddressPrimaryFlag'])) {
+           $primary = $_POST[$mod.$widget_id.'emailAddressPrimaryFlag'];
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
-            $emails[] = $_POST[$mod . $widget_id . 'emailAddress' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddress".$count])) {
+            $emails[] = $_POST[$mod.$widget_id.'emailAddress'.$count];
             $count++;
         }
 
-        if($count == 0) {
+        if ($count == 0) {
            return "";
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressOptOutFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressOptOutFlag'] as $v) {
               $optOut[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressInvalidFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressInvalidFlag'] as $v) {
               $invalid[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressReplyToFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressReplyToFlag'] as $v) {
               $replyTo[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressDeleteFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressDeleteFlag'] as $v) {
               $delete[] = $v;
            }
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
-            $verified[] = $_POST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddressVerifiedValue".$count])) {
+            $verified[] = $_POST[$mod.$widget_id.'emailAddressVerifiedValue'.$count];
             $count++;
         }
 
@@ -1069,33 +1069,33 @@ 
         $count = 0;
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $get .= '&' . $mod . '_email_widget_id='. $widget_id;
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $get .= '&'.$mod.'_email_widget_id='.$widget_id;
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddress'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddress".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddress'.$count]);
               $count++;
         } //while
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddressVerifiedValue".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count]);
               $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
-            if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+            if (isset($_REQUEST[$optionIdentifier])) {
+               if (is_array($_REQUEST[$optionIdentifier])) {
+                   foreach ($_REQUEST[$optionIdentifier] as $optOut) {
+                      $get .= "&".$optionIdentifier."[".$count."]=".$optOut;
                       $count++;
                    } //foreach
                } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                   $get .= "&".$optionIdentifier."=".$_REQUEST[$optionIdentifier];
                }
             } //if
         } //foreach
@@ -1113,7 +1113,7 @@ 
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
-        return ($module == "Employees")? "Users" : $module;
+        return ($module == "Employees") ? "Users" : $module;
     }
 
     public function stash($parentBeanId, $moduleName)
@@ -1123,7 +1123,7 @@ 
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result, false))
         {
-            $ids[] =$this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
+            $ids[] = $this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
         }
         if (!empty($ids))
         {
@@ -1147,15 +1147,15 @@ 
  * @param string $view DetailView or EditView
  * @return string
  */
-function getEmailAddressWidget($focus, $field, $value, $view, $tabindex='0') {
+function getEmailAddressWidget($focus, $field, $value, $view, $tabindex = '0') {
     $sea = new SugarEmailAddress();
     $sea->setView($view);
 
-        if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
+        if ($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
             if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
 
-            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
+            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false, '', $tabindex);
         }
 
     return $sea->getEmailAddressWidgetDetailView($focus);

include/utils/sugar_file_utils.php

Spacing +2 added lines, -2 removed lines

@@ -186,7 +186,7 @@ 
     $temp = tempnam($dir, 'temp');
 
     if (!($f = @fopen($temp, $mode))) {
-        $temp = $dir . DIRECTORY_SEPARATOR . uniqid('temp');
+        $temp = $dir.DIRECTORY_SEPARATOR.uniqid('temp');
         if (!($f = @fopen($temp, $mode))) {
             trigger_error("sugar_file_put_contents_atomic() : error writing temporary file '$temp'", E_USER_WARNING);
 
@@ -393,7 +393,7 @@ 
     }
     if (!is_windows()) {
         $conf_inst = SugarConfig::getInstance();
-        $mode = $conf_inst->get('default_permissions.' . $key, $mode);
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
     }
 
     return $mode;

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignMarketingEmailButton.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,11 +48,11 @@ 
         $id = $layout_def['focus']->id;
         $module = $layout_def['focus']->module_name;
 
-        $href = "index.php?module=$module&action=WizardMarketing&campaign_id=$id" . (!empty($layout_def['func']) ? '&func=' . $layout_def['func'] : '');
+        $href = "index.php?module=$module&action=WizardMarketing&campaign_id=$id".(!empty($layout_def['func']) ? '&func='.$layout_def['func'] : '');
 
         $label = $app_strings['LBL_CREATE_BUTTON_LABEL'];
 
-        return '<a onclick="location.href=\'' . $href . '\';">' . $label . '</a>';
+        return '<a onclick="location.href=\''.$href.'\';">'.$label.'</a>';
     }
 
 }
\ No newline at end of file

tests/tests/modules/Contacts/ContactTest.php

Indentation +211 added lines, -211 removed lines

@@ -2,68 +2,68 @@ 
 
 class ContactTest extends PHPUnit_Framework_TestCase {
 
-	public function testContact() {
+    public function testContact() {
 
-		//execute the contructor and check for the Object type and  attributes
-		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+        //execute the contructor and check for the Object type and  attributes
+        $contact = new Contact();
+        $this->assertInstanceOf('Contact',$contact);
+        $this->assertInstanceOf('Person',$contact);
+        $this->assertInstanceOf('SugarBean',$contact);
 
-		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
-		$this->assertAttributeEquals('Contact', 'object_name', $contact);
-		$this->assertAttributeEquals('contacts', 'table_name', $contact);
-		$this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
-		$this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
-		$this->assertAttributeEquals(true, 'importable', $contact);
-		$this->assertAttributeEquals(true, 'new_schema', $contact);
+        $this->assertAttributeEquals('Contacts', 'module_dir', $contact);
+        $this->assertAttributeEquals('Contact', 'object_name', $contact);
+        $this->assertAttributeEquals('contacts', 'table_name', $contact);
+        $this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
+        $this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
+        $this->assertAttributeEquals(true, 'importable', $contact);
+        $this->assertAttributeEquals(true, 'new_schema', $contact);
 
-	}
+    }
 
-	public function testadd_list_count_joins()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testadd_list_count_joins()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty strings
-		$query = "";
-		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with empty strings
+        $query = "";
+        $contact->add_list_count_joins($query, '');
+        $this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'accounts.name');
-		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'accounts.name');
+        $query = preg_replace('/\s+/', '', $query);
+        $expected =preg_replace('/\s+/', '', $expected);
+        $this->assertSame($expected,$query);
 		
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'contacts.name');
+        $this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-	}
+    }
 
-	public function testlistviewACLHelper()
-	{
-		$contact = new Contact();
+    public function testlistviewACLHelper()
+    {
+        $contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
-		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+        $expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+        $actual = $contact->listviewACLHelper();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
-	{
+    public function testcreate_new_list_query()
+    {
         /*
 		$contact = new Contact();
 
@@ -79,239 +79,239 @@ 
 		$this->assertSame($expected,$actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
 
-	public function testaddress_popup_create_new_list_query()
-	{
+    public function testaddress_popup_create_new_list_query()
+    {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testcreate_export_query()
-	{
-		$contact = new Contact();
+    public function testcreate_export_query()
+    {
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testfill_in_additional_list_fields() {
+    public function testfill_in_additional_list_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "firstn";
-		$contact->last_name = "lastn";
-		$contact->email1 = "1@test.com";
-		$contact->email2 = "2@test.com";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "firstn";
+        $contact->last_name = "lastn";
+        $contact->email1 = "1@test.com";
+        $contact->email2 = "2@test.com";
 
 
-		$contact->fill_in_additional_list_fields();
+        $contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+        $this->assertEquals("firstn lastn",$contact->full_name);
+        $this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
+        $this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields() {
+    public function testfill_in_additional_detail_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->id = "1";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->id = "1";
 
-		$contact->fill_in_additional_detail_fields();
+        $contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+        $this->assertEquals("",$contact->account_name);
+        $this->assertEquals("",$contact->account_id);
+        $this->assertEquals("",$contact->report_to_name);
 
-	}
+    }
 
 
-	public function testload_contacts_users_relationship(){
+    public function testload_contacts_users_relationship(){
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->load_contacts_users_relationship();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->load_contacts_users_relationship();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
-	public function testget_list_view_data() {
+    public function testget_list_view_data() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-
-		$expected = array (
-					  'NAME' => 'first last',
-					  'DELETED' => 0,
-					  'FIRST_NAME' => 'first',
-					  'LAST_NAME' => 'last',
-					  'FULL_NAME' => 'first last',
-					  'DO_NOT_CALL' => '0',
-					  'PORTAL_USER_TYPE' => 'Single user',
-					  'ENCODED_NAME' => 'first last',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
-					);
-
-		$actual = $contact->get_list_view_data();
-		//$this->assertSame($expected, $actual);
-		$this->assertEquals($expected['NAME'], $actual['NAME']);
-		$this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
-		$this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
-		$this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
-		$this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
-		$this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
-
-	}
-
-
-	public function testbuild_generic_where_clause ()
-	{
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
 
-		$contact = new Contact();
+        $expected = array (
+                        'NAME' => 'first last',
+                        'DELETED' => 0,
+                        'FIRST_NAME' => 'first',
+                        'LAST_NAME' => 'last',
+                        'FULL_NAME' => 'first last',
+                        'DO_NOT_CALL' => '0',
+                        'PORTAL_USER_TYPE' => 'Single user',
+                        'ENCODED_NAME' => 'first last',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
+                    );
 
-		//test with string
-		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
-		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        $actual = $contact->get_list_view_data();
+        //$this->assertSame($expected, $actual);
+        $this->assertEquals($expected['NAME'], $actual['NAME']);
+        $this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
+        $this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
+        $this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
+        $this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
+        $this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
 
+    }
 
-		//test with number
-		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
-		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
 
-	}
+    public function testbuild_generic_where_clause ()
+    {
 
-	public function testset_notification_body()
-	{
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-		$contact->description = "some text";
-		$contact->fill_in_additional_list_fields();
+        //test with string
+        $expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
+        $actual = $contact->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+        //test with number
+        $expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
+        $actual = $contact->build_generic_where_clause(1);
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testget_contact_id_by_email()
-	{
-		$contact = new Contact();
+    public function testset_notification_body()
+    {
+        $contact = new Contact();
 
-		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
+        $contact->description = "some text";
+        $contact->fill_in_additional_list_fields();
 
+        $result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		//$result = $contact->get_contact_id_by_email("test@test.com");
-		//$this->assertEquals(null,$result);
+        $this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
+        $this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
 
-		$this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
+    }
 
-	}
+    public function testget_contact_id_by_email()
+    {
+        $contact = new Contact();
 
-	public function testsave_relationship_changes() {
+        $result = $contact->get_contact_id_by_email("");
+        $this->assertEquals(null,$result);
 
-		$contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->save_relationship_changes(true);
-			$contact->save_relationship_changes(false);
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //$result = $contact->get_contact_id_by_email("test@test.com");
+        //$this->assertEquals(null,$result);
 
-	}
+        $this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
 
-	public function testbean_implements()
-	{
-		$contact = new Contact();
-		$this->assertEquals(false, $contact->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
-	}
+    }
 
-	public function testget_unlinked_email_query()
-	{
-		$contact = new Contact();
+    public function testsave_relationship_changes() {
 
-		//execute the method and verify that it retunrs expected results
-		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
-		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+        $contact = new Contact();
+
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->save_relationship_changes(true);
+            $contact->save_relationship_changes(false);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
+
+    }
+
+    public function testbean_implements()
+    {
+        $contact = new Contact();
+        $this->assertEquals(false, $contact->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
+    }
+
+    public function testget_unlinked_email_query()
+    {
+        $contact = new Contact();
+
+        //execute the method and verify that it retunrs expected results
+        $expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
+        $actual = $contact->get_unlinked_email_query();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
     public function testprocess_sync_to_outlook()
     {
-    	$contact = new Contact();
+        $contact = new Contact();
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-   			$contact->process_sync_to_outlook("all");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+                $contact->process_sync_to_outlook("all");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$contact->process_sync_to_outlook("1");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->process_sync_to_outlook("1");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
 
-	}
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -6,9 +6,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+		$this->assertInstanceOf('Contact', $contact);
+		$this->assertInstanceOf('Person', $contact);
+		$this->assertInstanceOf('SugarBean', $contact);
 
 		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
 		$this->assertAttributeEquals('Contact', 'object_name', $contact);
@@ -29,7 +29,7 @@ 
 		//test with empty strings
 		$query = "";
 		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 		//test with valid string
@@ -37,14 +37,14 @@ 
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'accounts.name');
 		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+		$expected = preg_replace('/\s+/', '', $expected);
+		$this->assertSame($expected, $query);
 		
 		//test with valid string
 		$query = "";
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 	}
@@ -53,9 +53,9 @@ 
 	{
 		$contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a");
 		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -89,14 +89,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -106,14 +106,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -130,9 +130,9 @@ 
 
 		$contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+		$this->assertEquals("firstn lastn", $contact->full_name);
+		$this->assertEquals("firstn lastn <1@test.com>", $contact->email_and_name1);
+		$this->assertEquals("firstn lastn <2@test.com>", $contact->email_and_name2);
 
 	}
 
@@ -145,14 +145,14 @@ 
 
 		$contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+		$this->assertEquals("", $contact->account_name);
+		$this->assertEquals("", $contact->account_id);
+		$this->assertEquals("", $contact->report_to_name);
 
 	}
 
 
-	public function testload_contacts_users_relationship(){
+	public function testload_contacts_users_relationship() {
 
 		$contact = new Contact();
 
@@ -175,7 +175,7 @@ 
 		$contact->first_name = "first";
 		$contact->last_name = "last";
 
-		$expected = array (
+		$expected = array(
 					  'NAME' => 'first last',
 					  'DELETED' => 0,
 					  'FIRST_NAME' => 'first',
@@ -201,7 +201,7 @@ 
 	}
 
 
-	public function testbuild_generic_where_clause ()
+	public function testbuild_generic_where_clause()
 	{
 
 		$contact = new Contact();
@@ -209,13 +209,13 @@ 
 		//test with string
 		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
 		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with number
 		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
 		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -231,8 +231,8 @@ 
 
 		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+		$this->assertEquals($contact->full_name, $result->_tpl_vars['CONTACT_NAME']);
+		$this->assertEquals($contact->description, $result->_tpl_vars['CONTACT_DESCRIPTION']);
 
 	}
 
@@ -241,7 +241,7 @@ 
 		$contact = new Contact();
 
 		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 
 		//$result = $contact->get_contact_id_by_email("test@test.com");
@@ -282,7 +282,7 @@ 
 		//execute the method and verify that it retunrs expected results
 		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
 		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 

tests/tests/modules/AOR_Reports/AOR_ReportTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $output = $me->jsParser();
 
             return $output;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             // Exception handling is left up to the implementer.
             throw $e;
         }

tests/tests/modules/Leads/LeadTest.php

Indentation +216 added lines, -216 removed lines

@@ -3,102 +3,102 @@ 
 class LeadTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testLead()
-	{
+    public function testLead()
+    {
 
-		//execute the contructor and check for the Object type and  attributes
-		$lead = new Lead();
+        //execute the contructor and check for the Object type and  attributes
+        $lead = new Lead();
 
-		$this->assertInstanceOf('Lead',$lead);
-		$this->assertInstanceOf('Person',$lead);
-		$this->assertInstanceOf('SugarBean',$lead);
+        $this->assertInstanceOf('Lead',$lead);
+        $this->assertInstanceOf('Person',$lead);
+        $this->assertInstanceOf('SugarBean',$lead);
 
-		$this->assertAttributeEquals('Leads', 'module_dir', $lead);
-		$this->assertAttributeEquals('Lead', 'object_name', $lead);
-		$this->assertAttributeEquals('Leads', 'object_names', $lead);
-		$this->assertAttributeEquals('leads', 'table_name', $lead);
+        $this->assertAttributeEquals('Leads', 'module_dir', $lead);
+        $this->assertAttributeEquals('Lead', 'object_name', $lead);
+        $this->assertAttributeEquals('Leads', 'object_names', $lead);
+        $this->assertAttributeEquals('leads', 'table_name', $lead);
 
-		$this->assertAttributeEquals(true, 'new_schema', $lead);
-		$this->assertAttributeEquals(true, 'importable', $lead);
+        $this->assertAttributeEquals(true, 'new_schema', $lead);
+        $this->assertAttributeEquals(true, 'importable', $lead);
 
-	}
+    }
 
-	public function testget_account()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testget_account()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_account();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_account();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->account_id =1;
-		$result = $lead->get_account();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->account_id =1;
+        $result = $lead->get_account();
+        $this->assertEquals(null,$result);
 
 
-	}
+    }
 
-	public function testget_opportunity()
-	{
+    public function testget_opportunity()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_opportunity();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_opportunity();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->opportunity_id =1;
-		$result = $lead->get_opportunity();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->opportunity_id =1;
+        $result = $lead->get_opportunity();
+        $this->assertEquals(null,$result);
 
-	}
+    }
 
-	public function testget_contact()
-	{
+    public function testget_contact()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test without pre settting attributes
-		$result = $lead->get_contact();
-		$this->assertEquals(null,$result);
+        //test without pre settting attributes
+        $result = $lead->get_contact();
+        $this->assertEquals(null,$result);
 
 
-		//test with required attributes preset
-		$lead->contact_id =1;
-		$result = $lead->get_contact();
-		$this->assertEquals(null,$result);
+        //test with required attributes preset
+        $lead->contact_id =1;
+        $result = $lead->get_contact();
+        $this->assertEquals(null,$result);
 
 
-	}
+    }
 
-	public function testcreate_list_query()
-	{
-		$lead = new Lead();
+    public function testcreate_list_query()
+    {
+        $lead = new Lead();
 
-		//test with empty string params
-		$expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where  leads.deleted=0 ";
-		$actual = $lead->create_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where  leads.deleted=0 ";
+        $actual = $lead->create_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where (users.user_name=\"\") AND  leads.deleted=0  ORDER BY leads.id";
-		$actual = $lead->create_list_query('leads.id','users.user_name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT leads.*, users.user_name assigned_user_name,leads_cstm.* FROM leads 			LEFT JOIN users\n                                ON leads.assigned_user_id=users.id LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN leads_cstm ON leads.id = leads_cstm.id_c where (users.user_name=\"\") AND  leads.deleted=0  ORDER BY leads.id";
+        $actual = $lead->create_list_query('leads.id','users.user_name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
-	{
+    public function testcreate_new_list_query()
+    {
         /*
 		$lead = new Lead();
 
@@ -114,26 +114,26 @@ 
 		$this->assertSame($expected,$actual);
         */
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
     public function testSaveAndConverted_lead()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$lead->first_name = "firstn";
-    	$lead->last_name ="lastnn";
-    	$lead->lead_source = "test";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastnn";
+        $lead->lead_source = "test";
 
-    	$result = $lead->save();
+        $result = $lead->save();
 
-    	//test for record ID to verify that record is saved
-    	$this->assertTrue(isset($lead->id));
-    	$this->assertEquals(36, strlen($lead->id));
-    	$this->assertEquals("New", $lead->status);
+        //test for record ID to verify that record is saved
+        $this->assertTrue(isset($lead->id));
+        $this->assertEquals(36, strlen($lead->id));
+        $this->assertEquals("New", $lead->status);
 
 
-    	//test converted_lead method after saving
-    	/*$lead->converted_lead("'" . $lead->id . "'" , "'1'", "'1'", "'1'");
+        //test converted_lead method after saving
+        /*$lead->converted_lead("'" . $lead->id . "'" , "'1'", "'1'", "'1'");
 
     	//retrieve back to test if attributes are updated in db
     	$lead = $lead->retrieve($lead->id);
@@ -144,206 +144,206 @@ 
     	$this->assertEquals("1", $lead->opportunity_id);
 		*/
 
-    	$this->markTestSkipped("converted_lead: Error in query, id's not properly escaped ");
+        $this->markTestSkipped("converted_lead: Error in query, id's not properly escaped ");
 
 
-    	//mark the record as deleted and verify that this record cannot be retrieved anymore.
-    	$lead->mark_deleted($lead->id);
-    	$result = $lead->retrieve($lead->id);
-    	$this->assertEquals(null,$result);
+        //mark the record as deleted and verify that this record cannot be retrieved anymore.
+        $lead->mark_deleted($lead->id);
+        $result = $lead->retrieve($lead->id);
+        $this->assertEquals(null,$result);
 
     }
 
 
 
-	public function testfill_in_additional_list_fields()
-	{
-		$lead = new Lead();
+    public function testfill_in_additional_list_fields()
+    {
+        $lead = new Lead();
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
 
-		$lead->fill_in_additional_list_fields();
+        $lead->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn", $lead->name );
+        $this->assertEquals("firstn lastn", $lead->name );
 
-	}
+    }
 
 
-	public function testfill_in_additional_detail_fields()
-	{
+    public function testfill_in_additional_detail_fields()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
 
-		$lead->fill_in_additional_detail_fields();
+        $lead->fill_in_additional_detail_fields();
 
-		$this->assertEquals("firstn lastn", $lead->name );
+        $this->assertEquals("firstn lastn", $lead->name );
 
 
 
-	}
+    }
 
-	public function testget_list_view_data(){
+    public function testget_list_view_data(){
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		$expected = array (
-					  'NAME' => ' ',
-					  'DELETED' => 0,
-					  'FULL_NAME' => ' ',
-					  'DO_NOT_CALL' => '0',
-					  'CONVERTED' => '0',
-					  'ENCODED_NAME' => ' ',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Leads\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Leads\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Leads","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Leads","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'ACC_NAME_FROM_ACCOUNTS' => NULL,
-					);
+        $expected = array (
+                        'NAME' => ' ',
+                        'DELETED' => 0,
+                        'FULL_NAME' => ' ',
+                        'DO_NOT_CALL' => '0',
+                        'CONVERTED' => '0',
+                        'ENCODED_NAME' => ' ',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Leads\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Leads\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Leads","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Leads","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'ACC_NAME_FROM_ACCOUNTS' => NULL,
+                    );
 
-		$actual = $lead->get_list_view_data();
+        $actual = $lead->get_list_view_data();
 
-		//$this->assertSame($expected, $actual);
-		$this->assertEquals($expected['NAME'], $actual['NAME']);
-		$this->assertEquals($expected['DELETED'], $actual['DELETED']);
-		$this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
-		$this->assertEquals($expected['DO_NOT_CALL'], $actual['DO_NOT_CALL']);
-		$this->assertEquals($expected['EMAIL1_LINK'], $actual['EMAIL1_LINK']);
+        //$this->assertSame($expected, $actual);
+        $this->assertEquals($expected['NAME'], $actual['NAME']);
+        $this->assertEquals($expected['DELETED'], $actual['DELETED']);
+        $this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
+        $this->assertEquals($expected['DO_NOT_CALL'], $actual['DO_NOT_CALL']);
+        $this->assertEquals($expected['EMAIL1_LINK'], $actual['EMAIL1_LINK']);
 
-	}
+    }
 
 
     public function testget_linked_fields()
     {
-    	$lead = new Lead();
-
-    	$expected = array (
-					  'created_by_link',
-					  'modified_user_link',
-					  'assigned_user_link',
-					  'email_addresses_primary',
-					  'email_addresses',
-					  'reports_to_link',
-					  'reportees',
-					  'contacts',
-					  'accounts',
-					  'contact',
-					  'opportunity',
-					  'campaign_leads',
-					  'tasks',
-					  'notes',
-					  'meetings',
-					  'calls',
-					  'emails',
-					  'campaigns',
-					  'prospect_lists',
-					  'fp_events_leads_1',
-					  'SecurityGroups',
-					);
-    	$actual = $lead->get_linked_fields();
-    	$this->assertTrue(is_array($actual));
+        $lead = new Lead();
+
+        $expected = array (
+                        'created_by_link',
+                        'modified_user_link',
+                        'assigned_user_link',
+                        'email_addresses_primary',
+                        'email_addresses',
+                        'reports_to_link',
+                        'reportees',
+                        'contacts',
+                        'accounts',
+                        'contact',
+                        'opportunity',
+                        'campaign_leads',
+                        'tasks',
+                        'notes',
+                        'meetings',
+                        'calls',
+                        'emails',
+                        'campaigns',
+                        'prospect_lists',
+                        'fp_events_leads_1',
+                        'SecurityGroups',
+                    );
+        $actual = $lead->get_linked_fields();
+        $this->assertTrue(is_array($actual));
         sort($expected);
         $actualKeys = array_keys($actual);
         sort($actualKeys);
-    	$this->assertSame($expected ,$actualKeys);
+        $this->assertSame($expected ,$actualKeys);
 
     }
 
-	public function testbuild_generic_where_clause ()
-	{
+    public function testbuild_generic_where_clause ()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test with empty string params
-		$expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
-		$actual = $lead->build_generic_where_clause("");
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
+        $actual = $lead->build_generic_where_clause("");
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
-		$actual = $lead->build_generic_where_clause("123");
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "leads.last_name like '%' or leads.account_name like '%' or leads.first_name like '%' or ea.email_address like '%'";
+        $actual = $lead->build_generic_where_clause("123");
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testset_notification_body()
-	{
+    public function testset_notification_body()
+    {
 
-		$lead = new Lead();
+        $lead = new Lead();
 
-		//test with attributes preset and verify template variables are set accordingly
+        //test with attributes preset and verify template variables are set accordingly
 
-		$lead->first_name = "firstn";
-		$lead->last_name ="lastn";
-		$lead->salutation = "Mr";
-		$lead->lead_source = "Email";
-		$lead->status = "New";
-		$lead->description = "tes description";
+        $lead->first_name = "firstn";
+        $lead->last_name ="lastn";
+        $lead->salutation = "Mr";
+        $lead->lead_source = "Email";
+        $lead->status = "New";
+        $lead->description = "tes description";
 
-		$result = $lead->set_notification_body(new Sugar_Smarty(), $lead);
+        $result = $lead->set_notification_body(new Sugar_Smarty(), $lead);
 
-		$this->assertEquals("Mr firstn lastn" ,$result->_tpl_vars['LEAD_NAME']);
-		$this->assertEquals($lead->lead_source ,$result->_tpl_vars['LEAD_SOURCE']);
-		$this->assertEquals($lead->status ,$result->_tpl_vars['LEAD_STATUS']);
-		$this->assertEquals($lead->description ,$result->_tpl_vars['LEAD_DESCRIPTION']);
+        $this->assertEquals("Mr firstn lastn" ,$result->_tpl_vars['LEAD_NAME']);
+        $this->assertEquals($lead->lead_source ,$result->_tpl_vars['LEAD_SOURCE']);
+        $this->assertEquals($lead->status ,$result->_tpl_vars['LEAD_STATUS']);
+        $this->assertEquals($lead->description ,$result->_tpl_vars['LEAD_DESCRIPTION']);
 
-	}
+    }
 
-	public function testbean_implements()
-	{
-		$lead = new Lead();
+    public function testbean_implements()
+    {
+        $lead = new Lead();
 
-		$this->assertEquals(false, $lead->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $lead->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $lead->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $lead->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $lead->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $lead->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
-	public function testlistviewACLHelper()
-	{
-		$lead = new Lead();
+    public function testlistviewACLHelper()
+    {
+        $lead = new Lead();
 
-		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a", "OPPORTUNITY"=>"a", "CONTACT"=>"a" );
-		$actual = $lead->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+        $expected = array("MAIN"=>"a", "ACCOUNT"=>"a", "OPPORTUNITY"=>"a", "CONTACT"=>"a" );
+        $actual = $lead->listviewACLHelper();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testconvertCustomFieldsForm()
-	{
-		$lead = new Lead();
+    public function testconvertCustomFieldsForm()
+    {
+        $lead = new Lead();
 
-		$form = "";
-		$prefix = "";
-		$tempBean = new Contact();
+        $form = "";
+        $prefix = "";
+        $tempBean = new Contact();
 
-		$result = $lead->convertCustomFieldsForm($form, $tempBean, $prefix);
+        $result = $lead->convertCustomFieldsForm($form, $tempBean, $prefix);
 
-		$this->assertEquals(true,$result);
-		$this->assertgreaterThanOrEqual("", $form); //no filed with source = custom_fields
+        $this->assertEquals(true,$result);
+        $this->assertgreaterThanOrEqual("", $form); //no filed with source = custom_fields
 
-	}
+    }
 
 
-	public function testget_unlinked_email_query()
-	{
-		$lead = new Lead();
+    public function testget_unlinked_email_query()
+    {
+        $lead = new Lead();
 
-		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Leads' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Leads' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
-		$actual = $lead->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+        $expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Leads' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Leads' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
+        $actual = $lead->get_unlinked_email_query();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
     public function testget_old_related_calls()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$expected = array();
+        $expected = array();
         $expected['select']='SELECT calls.id ';
         $expected['from']='FROM calls ';
         $expected['where']=" WHERE calls.parent_id = '$this->id'
@@ -351,28 +351,28 @@ 
         $expected['join'] = "";
         $expected['join_tables'][0] = '';
 
-    	$actual = $lead->get_old_related_calls();
-    	$this->assertSame($expected,$actual);
+        $actual = $lead->get_old_related_calls();
+        $this->assertSame($expected,$actual);
 
     }
 
 
     public function testgetActivitiesOptions()
-	{
-		$lead = new Lead();
+    {
+        $lead = new Lead();
 
-		$expected = array( "copy"=>"Copy", "move"=>"Move", "donothing"=>"Do Nothing");
-		$actual = $lead->getActivitiesOptions();
-		$this->assertSame($expected,$actual);
+        $expected = array( "copy"=>"Copy", "move"=>"Move", "donothing"=>"Do Nothing");
+        $actual = $lead->getActivitiesOptions();
+        $this->assertSame($expected,$actual);
 
     }
 
 
     public function testget_old_related_meetings()
     {
-    	$lead = new Lead();
+        $lead = new Lead();
 
-    	$expected = array();
+        $expected = array();
         $expected['select']='SELECT meetings.id ';
         $expected['from']='FROM meetings ';
         $expected['where']=" WHERE meetings.parent_id = ''
@@ -380,8 +380,8 @@ 
         $expected['join'] = "";
         $expected['join_tables'][0] = '';
 
-    	$actual = $lead->get_old_related_meetings();
-    	 $this->assertSame($expected,$actual);
+        $actual = $lead->get_old_related_meetings();
+            $this->assertSame($expected,$actual);
 
     }
 

tests/tests/modules/Project/ProjectTest.php

Indentation +101 added lines, -101 removed lines

@@ -3,132 +3,132 @@ 
 class ProjectTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testProject()
-	{
-		//execute the contructor and check for the Object type and  attributes
-		$project = new Project();
+    public function testProject()
+    {
+        //execute the contructor and check for the Object type and  attributes
+        $project = new Project();
 
-		$this->assertInstanceOf('Project',$project);
-		$this->assertInstanceOf('SugarBean',$project);
+        $this->assertInstanceOf('Project',$project);
+        $this->assertInstanceOf('SugarBean',$project);
 
 
-		$this->assertAttributeEquals('project', 'table_name', $project);
-		$this->assertAttributeEquals('Project', 'module_dir', $project);
-		$this->assertAttributeEquals('Project', 'object_name', $project);
+        $this->assertAttributeEquals('project', 'table_name', $project);
+        $this->assertAttributeEquals('Project', 'module_dir', $project);
+        $this->assertAttributeEquals('Project', 'object_name', $project);
 
-		$this->assertAttributeEquals(true, 'new_schema', $project);
+        $this->assertAttributeEquals(true, 'new_schema', $project);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testfill_in_additional_detail_fields()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$project = new Project();
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
-	public function testfill_in_additional_list_fields()
-	{
-		$project = new Project();
+    public function testfill_in_additional_list_fields()
+    {
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
     public function testsave_relationship_changes()
     {
 
-    	$project = new Project();
+        $project = new Project();
 
-    	$project->id =1;
-    	$_REQUEST['relate_id'] = 2;
-    	$_REQUEST['relate_to'] = "contacts";
+        $project->id =1;
+        $_REQUEST['relate_id'] = 2;
+        $_REQUEST['relate_to'] = "contacts";
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$project->save_relationship_changes(true);
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $project->save_relationship_changes(true);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
     }
 
 
-	public function test_get_total_estimated_effort()
-	{
-		//$project = new Project();
-		//$result = $project->_get_total_estimated_effort("1");
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    public function test_get_total_estimated_effort()
+    {
+        //$project = new Project();
+        //$result = $project->_get_total_estimated_effort("1");
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
 
-	}
+    }
 
 
-	public function test_get_total_actual_effort()
-	{
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
-	}
+    public function test_get_total_actual_effort()
+    {
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    }
 
 
-	public function testget_summary_text()
-	{
-		$project = new Project();
+    public function testget_summary_text()
+    {
+        $project = new Project();
 
-		//test without setting name
-		$this->assertEquals(Null,$project->get_summary_text());
+        //test without setting name
+        $this->assertEquals(Null,$project->get_summary_text());
 
-		//test with name set
-		$project->name = "test";
-		$this->assertEquals('test',$project->get_summary_text());
+        //test with name set
+        $project->name = "test";
+        $this->assertEquals('test',$project->get_summary_text());
 
-	}
+    }
 
 
-	public function testbuild_generic_where_clause ()
-	{
+    public function testbuild_generic_where_clause ()
+    {
 
-		$project = new Project();
+        $project = new Project();
 
-		//test with empty string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testget_list_view_data()
-	{
+    public function testget_list_view_data()
+    {
         /*
 		$project = new Project();
 
@@ -146,44 +146,44 @@ 
 		$this->assertSame($expected, $actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
-	public function testbean_implements(){
+    public function testbean_implements(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$this->assertEquals(false, $project->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $project->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
     public function testcreate_export_query()
     {
-    	$project = new Project();
+        $project = new Project();
 
-    	//test with empty string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
-    	$actual = $project->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
+        $actual = $project->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-    	//test with valid string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
-    	$actual = $project->create_export_query('project.id','users.user_name');
-    	$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
+        $actual = $project->create_export_query('project.id','users.user_name');
+        $this->assertSame($expected,$actual);
 
     }
 
-	public function testgetAllProjectTasks(){
+    public function testgetAllProjectTasks(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$project->id = 1;
-		$result = $project->getAllProjectTasks();
-		$this->assertTrue(is_array($result));
+        $project->id = 1;
+        $result = $project->getAllProjectTasks();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
 }
 ?>

modules/Tasks/metadata/SearchFields.php

Indentation +25 added lines, -25 removed lines

@@ -40,42 +40,42 @@
 global $current_user;
 $module_name = "Tasks";
 $searchFields['Tasks'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
         'contact_name' => array('query_type' => 'default', 'db_field' => array('contacts.first_name', 'contacts.last_name'), 'force_unifiedsearch' => true),        
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'task_status_dom', 'template_var' => 'STATUS_FILTER'),
         
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Completed', 'Deferred'),
-			'type'=>'bool',
-		),				
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Completed', 'Deferred'),
+            'type'=>'bool',
+        ),				
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
-			'subquery' => "SELECT favorites.parent_id FROM favorites
+            'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
 			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
             'db_field'=>array('id')),
-		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_due' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-		//Range Search Support 				
-	);
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_due' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 				
+    );
 ?>

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,10 +40,10 @@ 
 global $current_user;
 $module_name = "Tasks";
 $searchFields['Tasks'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+	array(
+		'name' => array('query_type'=>'default'),
         'contact_name' => array('query_type' => 'default', 'db_field' => array('contacts.first_name', 'contacts.last_name'), 'force_unifiedsearch' => true),        
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'task_status_dom', 'template_var' => 'STATUS_FILTER'),
         
@@ -60,22 +60,22 @@ 
 			'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
             'db_field'=>array('id')),
 		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_due' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_due' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 		//Range Search Support 				
 	);
 ?>