redCOMPONENT-COM / redCORE

extensions/libraries/redcore/html/rdropdown.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	{
 		$dropDownList = static::$dropDownList;
 		$dropDownList .= '</ul></div>';
-		static::$dropDownList	= null;
+		static::$dropDownList = null;
 		static::$loaded['JHtmlDropdown::start'] = false;
 
 		return $dropDownList;

Braces +2 added lines, -4 removed lines

@@ -133,8 +133,7 @@ 
 		{
 			$option = JFactory::getApplication()->input->getCmd('option');
 			$link = 'index.php?option=' . $option;
-		}
-		else
+		} else
 		{
 			$link = $customLink;
 		}
@@ -323,8 +322,7 @@ 
 		if ($ajaxLoad)
 		{
 			$href = ' href = "javascript:void(0)" onclick="loadAjax(\'' . $link . '\', \'' . $jsCallBackFunc . '\')"';
-		}
-		else
+		} else
 		{
 			$href = ' href = "' . $link . '" ';
 		}

extensions/libraries/redcore/database/driver.php

Braces +7 added lines, -14 removed lines

@@ -79,8 +79,7 @@ 
 							JError::setErrorHandling(E_ERROR, 'die');
 
 							return JError::raiseError(500, JText::sprintf('JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER', $options['driver']));
-						}
-						else
+						} else
 						{
 							throw new JDatabaseException(JText::sprintf('JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER', $options['driver']));
 						}
@@ -101,8 +100,7 @@ 
 						JError::setErrorHandling(E_ERROR, 'die');
 
 						return JError::raiseError(500, JText::sprintf('JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER', $options['driver']));
-					}
-					else
+					} else
 					{
 						throw new JDatabaseException(JText::sprintf('JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER', $options['driver']));
 					}
@@ -112,8 +110,7 @@ 
 				try
 				{
 					$instance = $class::getInstance($options);
-				}
-				catch (JDatabaseException $e)
+				} catch (JDatabaseException $e)
 				{
 
 					// Legacy error handling switch based on the JError::$legacy switch.
@@ -127,8 +124,7 @@ 
 						JError::setErrorHandling(E_ERROR, 'ignore');
 
 						return JError::raiseError(500, JText::sprintf('JLIB_DATABASE_ERROR_CONNECT_DATABASE', $e->getMessage()));
-					}
-					else
+					} else
 					{
 						throw new JDatabaseException(JText::sprintf('JLIB_DATABASE_ERROR_CONNECT_DATABASE', $e->getMessage()));
 					}
@@ -153,8 +149,7 @@ 
 			self::$instances = null;
 		}
 	}
-}
-else
+} else
 {
 	/**
 	 * Database Driver Class extends Joomla Platform Database Driver Class
@@ -218,8 +213,7 @@ 
 					);
 
 					$options['driver'] = 'mysqli';
-				}
-				else
+				} else
 				{
 					JLog::add(
 						'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.  Trying `pdomysql` instead.',
@@ -263,8 +257,7 @@ 
 				try
 				{
 					$instance = new $class($options);
-				}
-				catch (RuntimeException $e)
+				} catch (RuntimeException $e)
 				{
 					throw new RuntimeException(sprintf('Unable to connect to the Database: %s', $e->getMessage()));
 				}

extensions/libraries/redcore/database/sqlparser/lexersplitter.php

Indentation +14 added lines, -14 removed lines

@@ -41,21 +41,21 @@
 
 class RDatabaseSqlparserLexersplitter {
 
-    private static $splitters = array("\r\n", "!=", ">=", "<=", "<>", ":=", "\\", "&&", ">", "<", "|", "=", "^", "(",
-                                      ")", "\t", "\n", "'", "\"", "`", ",", "@", " ", "+", "-", "*", "/", ";");
-    private $tokenSize;
-    private $hashSet;
+	private static $splitters = array("\r\n", "!=", ">=", "<=", "<>", ":=", "\\", "&&", ">", "<", "|", "=", "^", "(",
+									  ")", "\t", "\n", "'", "\"", "`", ",", "@", " ", "+", "-", "*", "/", ";");
+	private $tokenSize;
+	private $hashSet;
 
-    public function __construct() {
-        $this->tokenSize = strlen(self::$splitters[0]); # should be the largest one
-        $this->hashSet = array_flip(self::$splitters);
-    }
+	public function __construct() {
+		$this->tokenSize = strlen(self::$splitters[0]); # should be the largest one
+		$this->hashSet = array_flip(self::$splitters);
+	}
 
-    public function getMaxLengthOfSplitter() {
-        return $this->tokenSize;
-    }
+	public function getMaxLengthOfSplitter() {
+		return $this->tokenSize;
+	}
 
-    public function isSplitter($token) {
-        return isset($this->hashSet[$token]);
-    }
+	public function isSplitter($token) {
+		return isset($this->hashSet[$token]);
+	}
 }

extensions/libraries/redcore/database/sqlparser/sqlparserutils.php

Indentation +13 added lines, -13 removed lines

@@ -141,18 +141,18 @@
 		'UTC_TIME', 'UTC_TIMESTAMP', 'UUID', 'VAR_POP', 'VAR_SAMP', 'VARIANCE',
 		'VERSION', 'WEEK', 'WEEKDAY', 'WEEKOFYEAR', 'YEAR', 'YEARWEEK');
 
-    /**
-     * Ends the given string $haystack with the string $needle?
-     * @param string $haystack
-     * @param string $needle
-     */
-    protected function endsWith($haystack, $needle) {
-        $length = strlen($needle);
-        if ($length == 0) {
-            return true;
-        }
+	/**
+	 * Ends the given string $haystack with the string $needle?
+	 * @param string $haystack
+	 * @param string $needle
+	 */
+	protected function endsWith($haystack, $needle) {
+		$length = strlen($needle);
+		if ($length == 0) {
+			return true;
+		}
 
-        $start = $length * -1;
-        return (substr($haystack, $start) === $needle);
-    }
+		$start = $length * -1;
+		return (substr($haystack, $start) === $needle);
+	}
 }

extensions/libraries/redcore/database/sqlparser/positioncalculator.php

Indentation +160 added lines, -160 removed lines

@@ -49,164 +49,164 @@
  */
 class RDatabaseSqlparserPositioncalculator extends RDatabaseSqlparserSqlparserutils {
 
-    private static $allowedOnOperator = array("\t", "\n", "\r", " ", ",", "(", ")", "_", "'", "\"");
-    private static $allowedOnOther = array("\t", "\n", "\r", " ", ",", "(", ")", "<", ">", "*", "+", "-", "/", "|",
-                                           "&", "=", "!", ";");
-
-    private function printPos($text, $sql, $charPos, $key, $parsed, $backtracking) {
-        if (!isset($_ENV['DEBUG'])) {
-            return;
-        }
-
-        $spaces = "";
-        $caller = debug_backtrace();
-        $i = 1;
-        while ($caller[$i]['function'] === 'lookForBaseExpression') {
-            $spaces .= "   ";
-            $i++;
-        }
-        $holdem = substr($sql, 0, $charPos) . "^" . substr($sql, $charPos);
-        echo $spaces . $text . " key:" . $key . "  parsed:" . $parsed . " back:" . serialize($backtracking) . " "
-                . $holdem . "\n";
-    }
-
-    public function setPositionsWithinSQL($sql, $parsed) {
-        $charPos = 0;
-        $backtracking = array();
-        $this->lookForBaseExpression($sql, $charPos, $parsed, 0, $backtracking);
-        return $parsed;
-    }
-
-    private function findPositionWithinString($sql, $value, $expr_type) {
-
-        $offset = 0;
-        while (true) {
-
-            $pos = strpos($sql, $value, $offset);
-            if ($pos === false) {
-                break;
-            }
-
-            $before = "";
-            if ($pos > 0) {
-                $before = $sql[$pos - 1];
-            }
-
-            $after = "";
-            if (isset($sql[$pos + strlen($value)])) {
-                $after = $sql[$pos + strlen($value)];
-            }
-
-	        // if we have an operator, it should be surrounded by
-	        // whitespace, comma, parenthesis, digit or letter, end_of_string
-	        // an operator should not be surrounded by another operator
-
-            if ($expr_type === 'operator') {
-
-                $ok = ($before === "" || in_array($before, self::$allowedOnOperator, true))
-                        || (strtolower($before) >= 'a' && strtolower($before) <= 'z')
-                        || ($before >= '0' && $before <= '9');
-                $ok = $ok
-                        && ($after === "" || in_array($after, self::$allowedOnOperator, true)
-                                || (strtolower($after) >= 'a' && strtolower($after) <= 'z')
-                                || ($after >= '0' && $after <= '9') || ($after === '?') || ($after === '@'));
-
-                if (!$ok) {
-                    $offset = $pos + 1;
-                    continue;
-                }
-
-                break;
-            }
-
-	        // in all other cases we accept
-	        // whitespace, comma, operators, parenthesis and end_of_string
-
-            $ok = ($before === "" || in_array($before, self::$allowedOnOther, true));
-            $ok = $ok && ($after === "" || in_array($after, self::$allowedOnOther, true));
-
-            if ($ok) {
-                break;
-            }
-
-            $offset = $pos + 1;
-        }
-
-        return $pos;
-    }
-
-    private function lookForBaseExpression($sql, &$charPos, &$parsed, $key, &$backtracking) {
-        if (!is_numeric($key)) {
-            if (($key === 'UNION' || $key === 'UNION ALL') || ($key === 'expr_type' && $parsed === 'expression')
-                    || ($key === 'expr_type' && $parsed === 'subquery')
-                    || ($key === 'expr_type' && $parsed === 'bracket_expression')
-                    || ($key === 'expr_type' && $parsed === 'table_expression')
-                    || ($key === 'expr_type' && $parsed === 'record')
-                    || ($key === 'expr_type' && $parsed === 'in-list') || ($key === 'alias' && $parsed !== false)) {
-	            // we hold the current position and come back after the next base_expr
-	            // we do this, because the next base_expr contains the complete expression/subquery/record
-	            // and we have to look into it too
-                $backtracking[] = $charPos;
-
-            } elseif (($key === 'ref_clause' || $key === 'columns') && $parsed !== false) {
-              // we hold the current position and come back after n base_expr(s)
-              // there is an array of sub-elements before (!) the base_expr clause of the current element
-              // so we go through the sub-elements and must come at the end
-                $backtracking[] = $charPos;
-                $parsedCount = count($parsed);
-                for ($i = 1; $i < $parsedCount; $i++) {
-                    $backtracking[] = false; // backtracking only after n base_expr!
-                }
-            } elseif ($key === 'sub_tree' && $parsed !== false) {
-              // we prevent wrong backtracking on subtrees (too much array_pop())
-              // there is an array of sub-elements after(!) the base_expr clause of the current element
-              // so we go through the sub-elements and must not come back at the end
-                $parsedCount = count($parsed);
-                for ($i = 1; $i < $parsedCount; $i++) {
-                    $backtracking[] = false;
-                }
-            } else {
-	            // move the current pos after the keyword
-	            // SELECT, WHERE, INSERT etc.
-                if (in_array($key, parent::$reserved)) {
-                    $charPos = stripos($sql, $key, $charPos);
-                    $charPos += strlen($key);
-                }
-            }
-        }
-
-        if (!is_array($parsed)) {
-            return;
-        }
-
-        foreach ($parsed as $key => $value) {
-            if ($key === 'base_expr') {
-
-	            // $this->printPos("0", $sql, $charPos, $key, $value, $backtracking);
-
-                $subject = substr($sql, $charPos);
-                $pos = $this->findPositionWithinString($subject, $value,
-                        isset($parsed['expr_type']) ? $parsed['expr_type'] : 'alias');
-                if ($pos === false) {
-                    throw new Exception("cannot calculate position of " . $value . " within " . $subject, 5);
-
-                }
-
-                $parsed['position'] = $charPos + $pos;
-                $charPos += $pos + strlen($value);
-
-	            // $this->printPos("1", $sql, $charPos, $key, $value, $backtracking);
-
-                $oldPos = array_pop($backtracking);
-                if (isset($oldPos) && $oldPos !== false) {
-                    $charPos = $oldPos;
-                }
-
-	            // $this->printPos("2", $sql, $charPos, $key, $value, $backtracking);
-
-            } else {
-                $this->lookForBaseExpression($sql, $charPos, $parsed[$key], $key, $backtracking);
-            }
-        }
-    }
+	private static $allowedOnOperator = array("\t", "\n", "\r", " ", ",", "(", ")", "_", "'", "\"");
+	private static $allowedOnOther = array("\t", "\n", "\r", " ", ",", "(", ")", "<", ">", "*", "+", "-", "/", "|",
+										   "&", "=", "!", ";");
+
+	private function printPos($text, $sql, $charPos, $key, $parsed, $backtracking) {
+		if (!isset($_ENV['DEBUG'])) {
+			return;
+		}
+
+		$spaces = "";
+		$caller = debug_backtrace();
+		$i = 1;
+		while ($caller[$i]['function'] === 'lookForBaseExpression') {
+			$spaces .= "   ";
+			$i++;
+		}
+		$holdem = substr($sql, 0, $charPos) . "^" . substr($sql, $charPos);
+		echo $spaces . $text . " key:" . $key . "  parsed:" . $parsed . " back:" . serialize($backtracking) . " "
+				. $holdem . "\n";
+	}
+
+	public function setPositionsWithinSQL($sql, $parsed) {
+		$charPos = 0;
+		$backtracking = array();
+		$this->lookForBaseExpression($sql, $charPos, $parsed, 0, $backtracking);
+		return $parsed;
+	}
+
+	private function findPositionWithinString($sql, $value, $expr_type) {
+
+		$offset = 0;
+		while (true) {
+
+			$pos = strpos($sql, $value, $offset);
+			if ($pos === false) {
+				break;
+			}
+
+			$before = "";
+			if ($pos > 0) {
+				$before = $sql[$pos - 1];
+			}
+
+			$after = "";
+			if (isset($sql[$pos + strlen($value)])) {
+				$after = $sql[$pos + strlen($value)];
+			}
+
+			// if we have an operator, it should be surrounded by
+			// whitespace, comma, parenthesis, digit or letter, end_of_string
+			// an operator should not be surrounded by another operator
+
+			if ($expr_type === 'operator') {
+
+				$ok = ($before === "" || in_array($before, self::$allowedOnOperator, true))
+						|| (strtolower($before) >= 'a' && strtolower($before) <= 'z')
+						|| ($before >= '0' && $before <= '9');
+				$ok = $ok
+						&& ($after === "" || in_array($after, self::$allowedOnOperator, true)
+								|| (strtolower($after) >= 'a' && strtolower($after) <= 'z')
+								|| ($after >= '0' && $after <= '9') || ($after === '?') || ($after === '@'));
+
+				if (!$ok) {
+					$offset = $pos + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			// in all other cases we accept
+			// whitespace, comma, operators, parenthesis and end_of_string
+
+			$ok = ($before === "" || in_array($before, self::$allowedOnOther, true));
+			$ok = $ok && ($after === "" || in_array($after, self::$allowedOnOther, true));
+
+			if ($ok) {
+				break;
+			}
+
+			$offset = $pos + 1;
+		}
+
+		return $pos;
+	}
+
+	private function lookForBaseExpression($sql, &$charPos, &$parsed, $key, &$backtracking) {
+		if (!is_numeric($key)) {
+			if (($key === 'UNION' || $key === 'UNION ALL') || ($key === 'expr_type' && $parsed === 'expression')
+					|| ($key === 'expr_type' && $parsed === 'subquery')
+					|| ($key === 'expr_type' && $parsed === 'bracket_expression')
+					|| ($key === 'expr_type' && $parsed === 'table_expression')
+					|| ($key === 'expr_type' && $parsed === 'record')
+					|| ($key === 'expr_type' && $parsed === 'in-list') || ($key === 'alias' && $parsed !== false)) {
+				// we hold the current position and come back after the next base_expr
+				// we do this, because the next base_expr contains the complete expression/subquery/record
+				// and we have to look into it too
+				$backtracking[] = $charPos;
+
+			} elseif (($key === 'ref_clause' || $key === 'columns') && $parsed !== false) {
+			  // we hold the current position and come back after n base_expr(s)
+			  // there is an array of sub-elements before (!) the base_expr clause of the current element
+			  // so we go through the sub-elements and must come at the end
+				$backtracking[] = $charPos;
+				$parsedCount = count($parsed);
+				for ($i = 1; $i < $parsedCount; $i++) {
+					$backtracking[] = false; // backtracking only after n base_expr!
+				}
+			} elseif ($key === 'sub_tree' && $parsed !== false) {
+			  // we prevent wrong backtracking on subtrees (too much array_pop())
+			  // there is an array of sub-elements after(!) the base_expr clause of the current element
+			  // so we go through the sub-elements and must not come back at the end
+				$parsedCount = count($parsed);
+				for ($i = 1; $i < $parsedCount; $i++) {
+					$backtracking[] = false;
+				}
+			} else {
+				// move the current pos after the keyword
+				// SELECT, WHERE, INSERT etc.
+				if (in_array($key, parent::$reserved)) {
+					$charPos = stripos($sql, $key, $charPos);
+					$charPos += strlen($key);
+				}
+			}
+		}
+
+		if (!is_array($parsed)) {
+			return;
+		}
+
+		foreach ($parsed as $key => $value) {
+			if ($key === 'base_expr') {
+
+				// $this->printPos("0", $sql, $charPos, $key, $value, $backtracking);
+
+				$subject = substr($sql, $charPos);
+				$pos = $this->findPositionWithinString($subject, $value,
+						isset($parsed['expr_type']) ? $parsed['expr_type'] : 'alias');
+				if ($pos === false) {
+					throw new Exception("cannot calculate position of " . $value . " within " . $subject, 5);
+
+				}
+
+				$parsed['position'] = $charPos + $pos;
+				$charPos += $pos + strlen($value);
+
+				// $this->printPos("1", $sql, $charPos, $key, $value, $backtracking);
+
+				$oldPos = array_pop($backtracking);
+				if (isset($oldPos) && $oldPos !== false) {
+					$charPos = $oldPos;
+				}
+
+				// $this->printPos("2", $sql, $charPos, $key, $value, $backtracking);
+
+			} else {
+				$this->lookForBaseExpression($sql, $charPos, $parsed[$key], $key, $backtracking);
+			}
+		}
+	}
 }

extensions/libraries/redcore/database/sqlparser/sqltranslation.php

Braces +21 added lines, -42 removed lines

@@ -119,8 +119,7 @@ 
 							if (in_array($tableColumn, $translationTables[$foundTable['originalTableName']]->primaryKeys))
 							{
 								$column['base_expr'] = $foundTable['alias']['originalName'] . '.' . $tableColumn;
-							}
-							else
+							} else
 							{
 								$column['base_expr'] = ''
 										. 'COALESCE('
@@ -161,8 +160,7 @@ 
 					return self::$parsedQueries[$hashedQueryKey];
 				}
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			return null;
 		}
@@ -203,8 +201,7 @@ 
 
 					$numbers[$index][$key] = $value;
 					unset($queryArray[$key]);
-				}
-				else
+				} else
 				{
 					if (!empty($numbers[$index]))
 					{
@@ -221,8 +218,7 @@ 
 					{
 						$queryArray[$key] = $value;
 					}
-				}
-				else
+				} else
 				{
 					$firstKey               = key($values);
 					$hashValue              = $db->q(md5(json_encode($values)));
@@ -356,19 +352,16 @@ 
 									if (empty($primaryKey) && $groupColumnsKey != 'FROM')
 									{
 										$tagColumnsValue['base_expr'] = self::breakColumnAndReplace($tagColumnsValue['base_expr'], $column['table']['alias']['name']);
-									}
-									else
+									} else
 									{
 										$tagColumnsValue['base_expr'] = self::breakColumnAndReplace($tagColumnsValue['base_expr'], $column['table']['alias']['originalName']);
 									}
-								}
-								else
+								} else
 								{
 									if (in_array($groupColumnsKey, array('ORDER', 'WHERE', 'GROUP')) && !empty($primaryKey))
 									{
 										$tagColumnsValue['base_expr'] = self::breakColumnAndReplace($tagColumnsValue['base_expr'], $column['table']['alias']['originalName']);
-									}
-									else
+									} else
 									{
 										$tagColumnsValue['base_expr'] = $column['base_expr'];
 
@@ -393,14 +386,12 @@ 
 									}
 								}
 							}
-						}
-						elseif (!empty($tagColumnsValue['sub_tree']))
+						} elseif (!empty($tagColumnsValue['sub_tree']))
 						{
 							if (!empty($tagColumnsValue['expr_type']) && $tagColumnsValue['expr_type'] == 'subquery')
 							{
 								// SubQuery is already parsed so we do not need to parse columns again
-							}
-							elseif (!empty($tagColumnsValue['expr_type']) && in_array($tagColumnsValue['expr_type'], array('expression')))
+							} elseif (!empty($tagColumnsValue['expr_type']) && in_array($tagColumnsValue['expr_type'], array('expression')))
 							{
 								foreach ($tagColumnsValue['sub_tree'] as $subKey => $subTree)
 								{
@@ -416,8 +407,7 @@ 
 										$tagColumnsValue['sub_tree'][$subKey]['sub_tree'] = $tagColumnsValue['sub_tree'][$subKey]['sub_tree'][$groupColumnsKey];
 									}
 								}
-							}
-							elseif (is_array($tagColumnsValue['sub_tree']))
+							} elseif (is_array($tagColumnsValue['sub_tree']))
 							{
 								// We will not replace some aggregate functions columns
 								if (!(in_array($tagColumnsValue['expr_type'], array('aggregate_function')) && strtolower($tagColumnsValue['base_expr']) == 'count'))
@@ -433,8 +423,7 @@ 
 											$columnFound,
 											false
 										);
-									}
-									else
+									} else
 									{
 										$tagColumnsValue['sub_tree'] = self::parseColumnReplacements(
 											array($groupColumnsKey => $tagColumnsValue['sub_tree']),
@@ -447,8 +436,7 @@ 
 									}
 								}
 							}
-						}
-						elseif (!empty($tagColumnsValue['ref_clause']))
+						} elseif (!empty($tagColumnsValue['ref_clause']))
 						{
 							if (is_array($tagColumnsValue['ref_clause']))
 							{
@@ -463,8 +451,7 @@ 
 										$columnFound,
 										false
 									);
-								}
-								else
+								} else
 								{
 									$tagColumnsValue['ref_clause'] = self::parseColumnReplacements(
 										array($groupColumnsKey => $tagColumnsValue['ref_clause']),
@@ -481,8 +468,7 @@ 
 						if (!is_numeric($tagKey))
 						{
 							$filteredGroup[$tagKey] = $tagColumnsValue;
-						}
-						else
+						} else
 						{
 							$filteredGroup[] = $tagColumnsValue;
 						}
@@ -620,8 +606,7 @@ 
 									$tagValue['base_expr'] = $parsedSubQuery;
 									$subQueryFound = true;
 								}
-							}
-							elseif (!empty($tagValue['expr_type']) && in_array($tagValue['expr_type'], array('expression')))
+							} elseif (!empty($tagValue['expr_type']) && in_array($tagValue['expr_type'], array('expression')))
 							{
 								foreach ($tagValue['sub_tree'] as $subKey => $subTree)
 								{
@@ -639,8 +624,7 @@ 
 											$tagValue['sub_tree'][$subKey]['base_expr'] = '(' . $parsedSubQuery . ')';
 											$subQueryFound = true;
 										}
-									}
-									elseif (!empty($tagValue['sub_tree'][$subKey]['sub_tree']))
+									} elseif (!empty($tagValue['sub_tree'][$subKey]['sub_tree']))
 									{
 										$tagValue['sub_tree'][$subKey]['sub_tree'] = self::parseTableReplacements(
 											$tagValue['sub_tree'][$subKey]['sub_tree'],
@@ -652,8 +636,7 @@ 
 										);
 									}
 								}
-							}
-							else
+							} else
 							{
 								$tagValue['sub_tree'] = self::parseTableReplacements(
 									$tagValue['sub_tree'],
@@ -669,8 +652,7 @@ 
 						if (!is_numeric($tagKey))
 						{
 							$filteredGroup[$tagKey] = $tagValue;
-						}
-						else
+						} else
 						{
 							$filteredGroup[] = $tagValue;
 						}
@@ -680,8 +662,7 @@ 
 							if (!empty($translationTables[$tableName]->tableJoinEndPosition))
 							{
 								$filteredGroupEndPosition[] = $newTagValue;
-							}
-							else
+							} else
 							{
 								$filteredGroup[] = $newTagValue;
 							}
@@ -939,8 +920,7 @@ 
 
 						return $fieldFromListQuotes;
 				}
-			}
-			elseif ($tableAlias == '')
+			} elseif ($tableAlias == '')
 			{
 				switch (self::cleanEscaping($fieldFromList['columnName']))
 				{
@@ -954,8 +934,7 @@ 
 
 						return $fieldFromList;
 				}
-			}
-			else
+			} else
 			{
 				switch (self::cleanEscaping($fieldFromList))
 				{

extensions/libraries/redcore/database/sqlparser/sqlcreator.php

Switch Indentation +19 added lines, -19 removed lines

@@ -51,25 +51,25 @@
 		$k = key($parsed);
 		switch ($k) {
 
-		case "UNION":
-		case "UNION ALL":
-			throw new Exception($k . " not implemented.", 20);
-			break;
-		case "SELECT":
-			$this->created = $this->processSelectStatement($parsed);
-			break;
-		case "INSERT":
-			$this->created = $this->processInsertStatement($parsed);
-			break;
-		case "DELETE":
-			$this->created = $this->processDeleteStatement($parsed);
-			break;
-		case "UPDATE":
-			$this->created = $this->processUpdateStatement($parsed);
-			break;
-		default:
-			throw new Exception($k . " not implemented.", 20);
-			break;
+			case "UNION":
+			case "UNION ALL":
+				throw new Exception($k . " not implemented.", 20);
+				break;
+			case "SELECT":
+				$this->created = $this->processSelectStatement($parsed);
+				break;
+			case "INSERT":
+				$this->created = $this->processInsertStatement($parsed);
+				break;
+			case "DELETE":
+				$this->created = $this->processDeleteStatement($parsed);
+				break;
+			case "UPDATE":
+				$this->created = $this->processUpdateStatement($parsed);
+				break;
+			default:
+				throw new Exception($k . " not implemented.", 20);
+				break;
 		}
 		return $this->created;
 	}

Braces +2 added lines, -4 removed lines

@@ -421,8 +421,7 @@ 
 	protected function processWhereBracketExpression($parsed) {
 		if (empty($parsed['expr_type']) || $parsed['expr_type'] !== 'bracket_expression') {
 			return "";
-		}
-		elseif (empty($parsed['sub_tree']))
+		} elseif (empty($parsed['sub_tree']))
 		{
 			return "()";
 		}
@@ -549,8 +548,7 @@ 
 		if (empty($parsed['expr_type']) || $parsed['expr_type'] !== 'bracket_expression')
 		{
 			return "";
-		}
-		elseif (empty($parsed['sub_tree']))
+		} elseif (empty($parsed['sub_tree']))
 		{
 			return "";
 		}

extensions/libraries/redcore/database/sqlparser/sqllexer.php

Indentation +295 added lines, -295 removed lines

@@ -47,322 +47,322 @@
  */
 class RDatabaseSqlparserSqllexer extends RDatabaseSqlparserSqlparserutils {
 
-    private $splitters;
+	private $splitters;
 
-    public function __construct() {
-        $this->splitters = new RDatabaseSqlparserLexersplitter();
-    }
+	public function __construct() {
+		$this->splitters = new RDatabaseSqlparserLexersplitter();
+	}
 
-    public function split($sql) {
-        if (!is_string($sql))
-            throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
+	public function split($sql) {
+		if (!is_string($sql))
+			throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
 
-        $tokens = array();
-        $token = '';
-
-        $splitLen = $this->splitters->getMaxLengthOfSplitter();
-        $len = strlen($sql);
-        $pos = 0;
-
-        while ($pos < $len) {
-
-            for ($i = $splitLen; $i > 0; $i--) {
-                $substr = substr($sql, $pos, $i);
-                if ($this->splitters->isSplitter($substr)) {
-
-                    if ($token !== "") {
-                        $tokens[] = $token;
-                    }
+		$tokens = array();
+		$token = '';
+
+		$splitLen = $this->splitters->getMaxLengthOfSplitter();
+		$len = strlen($sql);
+		$pos = 0;
+
+		while ($pos < $len) {
+
+			for ($i = $splitLen; $i > 0; $i--) {
+				$substr = substr($sql, $pos, $i);
+				if ($this->splitters->isSplitter($substr)) {
+
+					if ($token !== "") {
+						$tokens[] = $token;
+					}
 
-                    $tokens[] = $substr;
-                    $pos += $i;
-                    $token = '';
+					$tokens[] = $substr;
+					$pos += $i;
+					$token = '';
 
-                    continue 2;
-                }
-            }
+					continue 2;
+				}
+			}
 
-            $token .= $sql[$pos];
-            $pos++;
-        }
+			$token .= $sql[$pos];
+			$pos++;
+		}
 
-        if ($token !== "") {
-            $tokens[] = $token;
-        }
+		if ($token !== "") {
+			$tokens[] = $token;
+		}
 
-        $tokens = $this->concatEscapeSequences($tokens);
-        $tokens = $this->balanceBackticks($tokens);
-        $tokens = $this->concatColReferences($tokens);
-        $tokens = $this->balanceParenthesis($tokens);
-        $tokens = $this->balanceMultilineComments($tokens);
-        $tokens = $this->concatInlineComments($tokens);
-        $tokens = $this->concatUserDefinedVariables($tokens);
-        return $tokens;
-    }
-
-    private function concatUserDefinedVariables($tokens) {
-        $i = 0;
-        $cnt = count($tokens);
-        $userdef = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($userdef !== false) {
-                $tokens[$userdef] .= $token;
-                unset($tokens[$i]);
-                if ($token !== "@") {
-                    $userdef = false;
-                }
-            }
-
-            if ($userdef === false && $token === "@") {
-                $userdef = $i;
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function concatInlineComments($tokens) {
-
-        $i = 0;
-        $cnt = count($tokens);
-        $comment = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($comment !== false) {
-                if ($token === "\n" || $token === "\r\n") {
-                    $comment = false;
-                } else {
-                    unset($tokens[$i]);
-                    $tokens[$comment] .= $token;
-                }
-            }
-
-            if (($comment === false) && ($token === "-")) {
-                if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "-") {
-                    $comment = $i;
-                    $tokens[$i] = "--";
-                    $i++;
-                    unset($tokens[$i]);
-                    continue;
-                }
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function balanceMultilineComments($tokens) {
-
-        $i = 0;
-        $cnt = count($tokens);
-        $comment = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($comment !== false) {
-                unset($tokens[$i]);
-                $tokens[$comment] .= $token;
-                if ($token === "*" && isset($tokens[$i + 1]) && $tokens[$i + 1] === "/") {
-                    unset($tokens[$i + 1]);
-                    $tokens[$comment] .= "/";
-                    $comment = false;
-                }
-            }
-
-            if (($comment === false) && ($token === "/")) {
-                if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "*") {
-                    $comment = $i;
-                    $tokens[$i] = "/*";
-                    $i++;
-                    unset($tokens[$i]);
-                    continue;
-                }
-            }
-
-            $i++;
-        }
-        return array_values($tokens);
-    }
-
-    private function isBacktick($token) {
-        return ($token === "'" || $token === "\"" || $token === "`");
-    }
-
-    private function balanceBackticks($tokens) {
-        $i = 0;
-        $cnt = count($tokens);
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($this->isBacktick($token)) {
-                $tokens = $this->balanceCharacter($tokens, $i, $token);
-            }
-
-            $i++;
-        }
-
-        return $tokens;
-    }
+		$tokens = $this->concatEscapeSequences($tokens);
+		$tokens = $this->balanceBackticks($tokens);
+		$tokens = $this->concatColReferences($tokens);
+		$tokens = $this->balanceParenthesis($tokens);
+		$tokens = $this->balanceMultilineComments($tokens);
+		$tokens = $this->concatInlineComments($tokens);
+		$tokens = $this->concatUserDefinedVariables($tokens);
+		return $tokens;
+	}
+
+	private function concatUserDefinedVariables($tokens) {
+		$i = 0;
+		$cnt = count($tokens);
+		$userdef = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($userdef !== false) {
+				$tokens[$userdef] .= $token;
+				unset($tokens[$i]);
+				if ($token !== "@") {
+					$userdef = false;
+				}
+			}
+
+			if ($userdef === false && $token === "@") {
+				$userdef = $i;
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function concatInlineComments($tokens) {
+
+		$i = 0;
+		$cnt = count($tokens);
+		$comment = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($comment !== false) {
+				if ($token === "\n" || $token === "\r\n") {
+					$comment = false;
+				} else {
+					unset($tokens[$i]);
+					$tokens[$comment] .= $token;
+				}
+			}
+
+			if (($comment === false) && ($token === "-")) {
+				if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "-") {
+					$comment = $i;
+					$tokens[$i] = "--";
+					$i++;
+					unset($tokens[$i]);
+					continue;
+				}
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function balanceMultilineComments($tokens) {
+
+		$i = 0;
+		$cnt = count($tokens);
+		$comment = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($comment !== false) {
+				unset($tokens[$i]);
+				$tokens[$comment] .= $token;
+				if ($token === "*" && isset($tokens[$i + 1]) && $tokens[$i + 1] === "/") {
+					unset($tokens[$i + 1]);
+					$tokens[$comment] .= "/";
+					$comment = false;
+				}
+			}
+
+			if (($comment === false) && ($token === "/")) {
+				if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "*") {
+					$comment = $i;
+					$tokens[$i] = "/*";
+					$i++;
+					unset($tokens[$i]);
+					continue;
+				}
+			}
+
+			$i++;
+		}
+		return array_values($tokens);
+	}
+
+	private function isBacktick($token) {
+		return ($token === "'" || $token === "\"" || $token === "`");
+	}
+
+	private function balanceBackticks($tokens) {
+		$i = 0;
+		$cnt = count($tokens);
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($this->isBacktick($token)) {
+				$tokens = $this->balanceCharacter($tokens, $i, $token);
+			}
+
+			$i++;
+		}
+
+		return $tokens;
+	}
 
 	// backticks are not balanced within one token, so we have
 	// to re-combine some tokens
-    private function balanceCharacter($tokens, $idx, $char) {
+	private function balanceCharacter($tokens, $idx, $char) {
 
-        $token_count = count($tokens);
-        $i = $idx + 1;
-        while ($i < $token_count) {
+		$token_count = count($tokens);
+		$i = $idx + 1;
+		while ($i < $token_count) {
 
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
 
-            $token = $tokens[$i];
-            $tokens[$idx] .= $token;
-            unset($tokens[$i]);
+			$token = $tokens[$i];
+			$tokens[$idx] .= $token;
+			unset($tokens[$i]);
 
-            if ($token === $char) {
-                break;
-            }
+			if ($token === $char) {
+				break;
+			}
 
-            $i++;
-        }
-        return array_values($tokens);
-    }
+			$i++;
+		}
+		return array_values($tokens);
+	}
 
-    /*
+	/*
      * does the token ends with dot?
      * concat it with the next token
      * 
      * does the token starts with a dot?
      * concat it with the previous token
      */
-    private function concatColReferences($tokens) {
-
-        $cnt = count($tokens);
-        $i = 0;
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            if ($tokens[$i][0] === ".") {
-
-                // concat the previous tokens, till the token has been changed
-                $k = $i - 1;
-                $len = strlen($tokens[$i]);
-                while (($k >= 0) && ($len == strlen($tokens[$i]))) {
-                    if (!isset($tokens[$k])) { // FIXME: this can be wrong if we have schema . table . column
-                        $k--;
-                        continue;
-                    }
-                    $tokens[$i] = $tokens[$k] . $tokens[$i];
-                    unset($tokens[$k]);
-                    $k--;
-                }
-            }
-
-            if ($this->endsWith($tokens[$i], '.')) {
-
-                // concat the next tokens, till the token has been changed
-                $k = $i + 1;
-                $len = strlen($tokens[$i]);
-                while (($k < $cnt) && ($len == strlen($tokens[$i]))) {
-                    if (!isset($tokens[$k])) {
-                        $k++;
-                        continue;
-                    }
-                    $tokens[$i] .= $tokens[$k];
-                    unset($tokens[$k]);
-                    $k++;
-                }
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function concatEscapeSequences($tokens) {
-        $tokenCount = count($tokens);
-        $i = 0;
-        while ($i < $tokenCount) {
-
-            if ($this->endsWith($tokens[$i], "\\")) {
-                $i++;
-                if (isset($tokens[$i])) {
-                    $tokens[$i - 1] .= $tokens[$i];
-                    unset($tokens[$i]);
-                }
-            }
-            $i++;
-        }
-        return array_values($tokens);
-    }
-
-    private function balanceParenthesis($tokens) {
-        $token_count = count($tokens);
-        $i = 0;
-        while ($i < $token_count) {
-            if ($tokens[$i] !== '(') {
-                $i++;
-                continue;
-            }
-            $count = 1;
-            for ($n = $i + 1; $n < $token_count; $n++) {
-                $token = $tokens[$n];
-                if ($token === '(') {
-                    $count++;
-                }
-                if ($token === ')') {
-                    $count--;
-                }
-                $tokens[$i] .= $token;
-                unset($tokens[$n]);
-                if ($count === 0) {
-                    $n++;
-                    break;
-                }
-            }
-            $i = $n;
-        }
-        return array_values($tokens);
-    }
+	private function concatColReferences($tokens) {
+
+		$cnt = count($tokens);
+		$i = 0;
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			if ($tokens[$i][0] === ".") {
+
+				// concat the previous tokens, till the token has been changed
+				$k = $i - 1;
+				$len = strlen($tokens[$i]);
+				while (($k >= 0) && ($len == strlen($tokens[$i]))) {
+					if (!isset($tokens[$k])) { // FIXME: this can be wrong if we have schema . table . column
+						$k--;
+						continue;
+					}
+					$tokens[$i] = $tokens[$k] . $tokens[$i];
+					unset($tokens[$k]);
+					$k--;
+				}
+			}
+
+			if ($this->endsWith($tokens[$i], '.')) {
+
+				// concat the next tokens, till the token has been changed
+				$k = $i + 1;
+				$len = strlen($tokens[$i]);
+				while (($k < $cnt) && ($len == strlen($tokens[$i]))) {
+					if (!isset($tokens[$k])) {
+						$k++;
+						continue;
+					}
+					$tokens[$i] .= $tokens[$k];
+					unset($tokens[$k]);
+					$k++;
+				}
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function concatEscapeSequences($tokens) {
+		$tokenCount = count($tokens);
+		$i = 0;
+		while ($i < $tokenCount) {
+
+			if ($this->endsWith($tokens[$i], "\\")) {
+				$i++;
+				if (isset($tokens[$i])) {
+					$tokens[$i - 1] .= $tokens[$i];
+					unset($tokens[$i]);
+				}
+			}
+			$i++;
+		}
+		return array_values($tokens);
+	}
+
+	private function balanceParenthesis($tokens) {
+		$token_count = count($tokens);
+		$i = 0;
+		while ($i < $token_count) {
+			if ($tokens[$i] !== '(') {
+				$i++;
+				continue;
+			}
+			$count = 1;
+			for ($n = $i + 1; $n < $token_count; $n++) {
+				$token = $tokens[$n];
+				if ($token === '(') {
+					$count++;
+				}
+				if ($token === ')') {
+					$count--;
+				}
+				$tokens[$i] .= $token;
+				unset($tokens[$n]);
+				if ($count === 0) {
+					$n++;
+					break;
+				}
+			}
+			$i = $n;
+		}
+		return array_values($tokens);
+	}
 }

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
     }
 
     public function split($sql) {
-        if (!is_string($sql))
-            throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
+        if (!is_string($sql)) {
+                    throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
+        }
 
         $tokens = array();
         $token = '';

extensions/libraries/redcore/database/sqlparser/sqlparser.php

Switch Indentation +473 added lines, -473 removed lines

@@ -243,244 +243,244 @@ 
 			switch ($upper) {
 
 			/* Tokens that get their own sections. These keywords have subclauses. */
-			case 'SELECT':
-			case 'ORDER':
-			case 'LIMIT':
-			case 'SET':
-			case 'DUPLICATE':
-			case 'VALUES':
-			case 'GROUP':
-			case 'HAVING':
-			case 'WHERE':
-			case 'RENAME':
-			case 'CALL':
-			case 'PROCEDURE':
-			case 'FUNCTION':
-			case 'DATABASE':
-			case 'SERVER':
-			case 'LOGFILE':
-			case 'DEFINER':
-			case 'RETURNS':
-			case 'TABLESPACE':
-			case 'TRIGGER':
-			case 'DO':
-			case 'PLUGIN':
-			case 'FROM':
-			case 'FLUSH':
-			case 'KILL':
-			case 'RESET':
-			case 'START':
-			case 'STOP':
-			case 'PURGE':
-			case 'EXECUTE':
-			case 'PREPARE':
-			case 'DEALLOCATE':
-				if ($trim === 'DEALLOCATE') {
-					$skip_next = true;
-				}
-				/* this FROM is different from FROM in other DML (not join related) */
-				if ($token_category === 'PREPARE' && $upper === 'FROM') {
-					continue 2;
-				}
-
-				$token_category = $upper;
-				break;
+				case 'SELECT':
+				case 'ORDER':
+				case 'LIMIT':
+				case 'SET':
+				case 'DUPLICATE':
+				case 'VALUES':
+				case 'GROUP':
+				case 'HAVING':
+				case 'WHERE':
+				case 'RENAME':
+				case 'CALL':
+				case 'PROCEDURE':
+				case 'FUNCTION':
+				case 'DATABASE':
+				case 'SERVER':
+				case 'LOGFILE':
+				case 'DEFINER':
+				case 'RETURNS':
+				case 'TABLESPACE':
+				case 'TRIGGER':
+				case 'DO':
+				case 'PLUGIN':
+				case 'FROM':
+				case 'FLUSH':
+				case 'KILL':
+				case 'RESET':
+				case 'START':
+				case 'STOP':
+				case 'PURGE':
+				case 'EXECUTE':
+				case 'PREPARE':
+				case 'DEALLOCATE':
+					if ($trim === 'DEALLOCATE') {
+						$skip_next = true;
+					}
+					/* this FROM is different from FROM in other DML (not join related) */
+					if ($token_category === 'PREPARE' && $upper === 'FROM') {
+						continue 2;
+					}
 
-			case 'EVENT':
-				// issue 71
-				if ($prev_category === 'DROP' || $prev_category === 'ALTER' || $prev_category === 'CREATE') {
 					$token_category = $upper;
-				}
-				break;
+					break;
 
-			case 'DATA':
-				// prevent wrong handling of DATA as keyword
-				if ($prev_category === 'LOAD') {
-					$token_category = $upper;
-				}
-				break;
+				case 'EVENT':
+					// issue 71
+					if ($prev_category === 'DROP' || $prev_category === 'ALTER' || $prev_category === 'CREATE') {
+						$token_category = $upper;
+					}
+					break;
 
-			case 'PASSWORD':
-				// prevent wrong handling of PASSWORD as keyword
-				if ($prev_category === 'SET') {
-					$token_category = $upper;
-				}
-				break;
+				case 'DATA':
+					// prevent wrong handling of DATA as keyword
+					if ($prev_category === 'LOAD') {
+						$token_category = $upper;
+					}
+					break;
 
-			case 'INTO':
-				// prevent wrong handling of CACHE within LOAD INDEX INTO CACHE...
-				if ($prev_category === 'LOAD') {
-					$out[$prev_category][] = $upper;
-					continue 2;
-				}
-				$token_category = $upper;
-				break;
+				case 'PASSWORD':
+					// prevent wrong handling of PASSWORD as keyword
+					if ($prev_category === 'SET') {
+						$token_category = $upper;
+					}
+					break;
 
-			case 'USER':
-				// prevent wrong processing as keyword
-				if ($prev_category === 'CREATE' || $prev_category === 'RENAME' || $prev_category === 'DROP') {
+				case 'INTO':
+					// prevent wrong handling of CACHE within LOAD INDEX INTO CACHE...
+					if ($prev_category === 'LOAD') {
+						$out[$prev_category][] = $upper;
+						continue 2;
+					}
 					$token_category = $upper;
-				}
-				break;
+					break;
 
-			case 'VIEW':
-				// prevent wrong processing as keyword
-				if ($prev_category === 'CREATE' || $prev_category === 'ALTER' || $prev_category === 'DROP') {
-					$token_category = $upper;
-				}
-				break;
+				case 'USER':
+					// prevent wrong processing as keyword
+					if ($prev_category === 'CREATE' || $prev_category === 'RENAME' || $prev_category === 'DROP') {
+						$token_category = $upper;
+					}
+					break;
+
+				case 'VIEW':
+					// prevent wrong processing as keyword
+					if ($prev_category === 'CREATE' || $prev_category === 'ALTER' || $prev_category === 'DROP') {
+						$token_category = $upper;
+					}
+					break;
 
-			/* These tokens get their own section, but have no subclauses.
+				/* These tokens get their own section, but have no subclauses.
 			 These tokens identify the statement but have no specific subclauses of their own. */
-			case 'DELETE':
-			case 'ALTER':
-			case 'INSERT':
-			case 'REPLACE':
-			case 'TRUNCATE':
-			case 'CREATE':
-			case 'OPTIMIZE':
-			case 'GRANT':
-			case 'REVOKE':
-			case 'SHOW':
-			case 'HANDLER':
-			case 'LOAD':
-			case 'ROLLBACK':
-			case 'SAVEPOINT':
-			case 'UNLOCK':
-			case 'INSTALL':
-			case 'UNINSTALL':
-			case 'ANALZYE':
-			case 'BACKUP':
-			case 'CHECK':
-			case 'CHECKSUM':
-			case 'REPAIR':
-			case 'RESTORE':
-			case 'DESCRIBE':
-			case 'EXPLAIN':
-			case 'USE':
-			case 'HELP':
-				// We are using USE from FROM statement, not separate token category
-				if ($prev_category == 'FROM')
-				{
-					continue;
-				}
-				$token_category = $upper; /* set the category in case these get subclauses
+				case 'DELETE':
+				case 'ALTER':
+				case 'INSERT':
+				case 'REPLACE':
+				case 'TRUNCATE':
+				case 'CREATE':
+				case 'OPTIMIZE':
+				case 'GRANT':
+				case 'REVOKE':
+				case 'SHOW':
+				case 'HANDLER':
+				case 'LOAD':
+				case 'ROLLBACK':
+				case 'SAVEPOINT':
+				case 'UNLOCK':
+				case 'INSTALL':
+				case 'UNINSTALL':
+				case 'ANALZYE':
+				case 'BACKUP':
+				case 'CHECK':
+				case 'CHECKSUM':
+				case 'REPAIR':
+				case 'RESTORE':
+				case 'DESCRIBE':
+				case 'EXPLAIN':
+				case 'USE':
+				case 'HELP':
+					// We are using USE from FROM statement, not separate token category
+					if ($prev_category == 'FROM')
+					{
+						continue;
+					}
+					$token_category = $upper; /* set the category in case these get subclauses
 										  in a future version of MySQL */
-				$out[$upper][0] = $upper;
-				continue 2;
-
-			case 'CACHE':
-				if ($prev_category === "" || $prev_category === 'RESET' || $prev_category === 'FLUSH'
-						|| $prev_category === 'LOAD') {
-					$token_category = $upper;
+					$out[$upper][0] = $upper;
 					continue 2;
-				}
-				break;
 
-			/* This is either LOCK TABLES or SELECT ... LOCK IN SHARE MODE*/
-			case 'LOCK':
-				if ($token_category === "") {
-					$token_category = $upper;
-					$out[$upper][0] = $upper;
-				} else {
-					$trim = 'LOCK IN SHARE MODE';
-					$skip_next = true;
-					$out['OPTIONS'][] = $trim;
-				}
-				continue 2;
+				case 'CACHE':
+					if ($prev_category === "" || $prev_category === 'RESET' || $prev_category === 'FLUSH'
+							|| $prev_category === 'LOAD') {
+						$token_category = $upper;
+						continue 2;
+					}
+					break;
 
-			case 'USING': /* USING in FROM clause is different from USING w/ prepared statement*/
-				if ($token_category === 'EXECUTE') {
-					$token_category = $upper;
-					continue 2;
-				}
-				if ($token_category === 'FROM' && !empty($out['DELETE'])) {
-					$token_category = $upper;
+				/* This is either LOCK TABLES or SELECT ... LOCK IN SHARE MODE*/
+				case 'LOCK':
+					if ($token_category === "") {
+						$token_category = $upper;
+						$out[$upper][0] = $upper;
+					} else {
+						$trim = 'LOCK IN SHARE MODE';
+						$skip_next = true;
+						$out['OPTIONS'][] = $trim;
+					}
 					continue 2;
-				}
-				break;
 
-			/* DROP TABLE is different from ALTER TABLE DROP ... */
-			case 'DROP':
-				if ($token_category !== 'ALTER') {
-					$token_category = $upper;
-					$out[$upper][0] = $upper;
-					continue 2;
-				}
-				break;
+				case 'USING': /* USING in FROM clause is different from USING w/ prepared statement*/
+					if ($token_category === 'EXECUTE') {
+						$token_category = $upper;
+						continue 2;
+					}
+					if ($token_category === 'FROM' && !empty($out['DELETE'])) {
+						$token_category = $upper;
+						continue 2;
+					}
+					break;
 
-			case 'FOR':
-				$skip_next = true;
-				$out['OPTIONS'][] = 'FOR UPDATE';
-				continue 2;
+				/* DROP TABLE is different from ALTER TABLE DROP ... */
+				case 'DROP':
+					if ($token_category !== 'ALTER') {
+						$token_category = $upper;
+						$out[$upper][0] = $upper;
+						continue 2;
+					}
+					break;
 
-			case 'UPDATE':
-				if ($token_category === "") {
-					$token_category = $upper;
+				case 'FOR':
+					$skip_next = true;
+					$out['OPTIONS'][] = 'FOR UPDATE';
 					continue 2;
 
-				}
-				if ($token_category === 'DUPLICATE') {
-					continue 2;
-				}
-				break;
+				case 'UPDATE':
+					if ($token_category === "") {
+						$token_category = $upper;
+						continue 2;
 
-			/*case 'START':
+					}
+					if ($token_category === 'DUPLICATE') {
+						continue 2;
+					}
+					break;
+
+				/*case 'START':
 				$trim = "BEGIN";
 				$out[$upper][0] = $upper;
 				$skip_next = true;
 				break;*/
 
-			/* These tokens are ignored. */
-			case 'BY':
-			case 'ALL':
-			case 'SHARE':
-			case 'MODE':
-			case 'TO':
-			case ';':
-				continue 2;
-
-			case 'KEY':
-				if ($token_category === 'DUPLICATE') {
+				/* These tokens are ignored. */
+				case 'BY':
+				case 'ALL':
+				case 'SHARE':
+				case 'MODE':
+				case 'TO':
+				case ';':
 					continue 2;
-				}
-				break;
 
-			/* These tokens set particular options for the statement.  They never stand alone.*/
-			case 'HIGH_PRIORITY':
-			case 'LOW_PRIORITY':
-			case 'DELAYED':
-			case 'IGNORE':
-			case 'FORCE':
-			case 'STRAIGHT_JOIN':
-			case 'SQL_SMALL_RESULT':
-			case 'SQL_BIG_RESULT':
-			case 'QUICK':
-			case 'SQL_BUFFER_RESULT':
-			case 'SQL_CACHE':
-			case 'SQL_NO_CACHE':
-			case 'SQL_CALC_FOUND_ROWS':
-				$out['OPTIONS'][] = $upper;
-				continue 2;
-
-			case 'WITH':
-				if ($token_category === 'GROUP') {
-					$skip_next = true;
-					$out['OPTIONS'][] = 'WITH ROLLUP';
+				case 'KEY':
+					if ($token_category === 'DUPLICATE') {
+						continue 2;
+					}
+					break;
+
+				/* These tokens set particular options for the statement.  They never stand alone.*/
+				case 'HIGH_PRIORITY':
+				case 'LOW_PRIORITY':
+				case 'DELAYED':
+				case 'IGNORE':
+				case 'FORCE':
+				case 'STRAIGHT_JOIN':
+				case 'SQL_SMALL_RESULT':
+				case 'SQL_BIG_RESULT':
+				case 'QUICK':
+				case 'SQL_BUFFER_RESULT':
+				case 'SQL_CACHE':
+				case 'SQL_NO_CACHE':
+				case 'SQL_CALC_FOUND_ROWS':
+					$out['OPTIONS'][] = $upper;
 					continue 2;
-				}
-				break;
 
-			case 'AS':
-				break;
+				case 'WITH':
+					if ($token_category === 'GROUP') {
+						$skip_next = true;
+						$out['OPTIONS'][] = 'WITH ROLLUP';
+						continue 2;
+					}
+					break;
 
-			case '':
-			case ',':
-			//case ';':
-				break;
+				case 'AS':
+					break;
 
-			default:
-				break;
+				case '':
+				case ',':
+				//case ';':
+					break;
+
+				default:
+					break;
 			}
 
 			// remove obsolete category after union (empty category because of
@@ -570,14 +570,14 @@ 
 		$type = substr($expression, 2, strpos($expression, ".", 2));
 
 		switch ($type) {
-		case 'GLOBAL':
-		case 'LOCAL':
-		case 'SESSION':
-			$type = strtolower($type) . '_variable';
-			break;
-		default:
-			$type = 'session_variable';
-			break;
+			case 'GLOBAL':
+			case 'LOCAL':
+			case 'SESSION':
+				$type = strtolower($type) . '_variable';
+				break;
+			default:
+				$type = 'session_variable';
+				break;
 		}
 		return $type;
 	}
@@ -591,29 +591,29 @@ 
 			$upper = strtoupper(trim($token));
 
 			switch ($upper) {
-			case 'LOCAL':
-			case 'SESSION':
-			case 'GLOBAL':
-				if (!$isUpdate) {
-					$varType = strtolower($upper) . '_variable';
-					$baseExpr = "";
-					continue 2;
-				}
-				break;
+				case 'LOCAL':
+				case 'SESSION':
+				case 'GLOBAL':
+					if (!$isUpdate) {
+						$varType = strtolower($upper) . '_variable';
+						$baseExpr = "";
+						continue 2;
+					}
+					break;
 
-			case ',':
-				$assignment = $this->getAssignment($baseExpr);
-				if (!$isUpdate) {
-					if ($varType !== false) {
-						$assignment['sub_tree'][0]['expr_type'] = $varType;
+				case ',':
+					$assignment = $this->getAssignment($baseExpr);
+					if (!$isUpdate) {
+						if ($varType !== false) {
+							$assignment['sub_tree'][0]['expr_type'] = $varType;
+						}
 					}
-				}
-				$result[] = $assignment;
-				$baseExpr = "";
-				$varType = false;
-				continue 2;
+					$result[] = $assignment;
+					$baseExpr = "";
+					$varType = false;
+					continue 2;
 
-			default:
+				default:
 			}
 			$baseExpr .= $token;
 		}
@@ -867,122 +867,122 @@ 
 			}
 
 			switch ($upper) {
-			case 'OUTER':
-			case 'LEFT':
-			case 'RIGHT':
-			case 'NATURAL':
-			case 'CROSS':
-			case ',':
-			case 'JOIN':
-			case 'INNER':
-				break;
+				case 'OUTER':
+				case 'LEFT':
+				case 'RIGHT':
+				case 'NATURAL':
+				case 'CROSS':
+				case ',':
+				case 'JOIN':
+				case 'INNER':
+					break;
 
-			default:
-				$parseInfo['expression'] .= $token;
-				if ($parseInfo['ref_type'] !== false) { // all after ON / USING
-					$parseInfo['ref_expr'] .= $token;
-				}
-				break;
+				default:
+					$parseInfo['expression'] .= $token;
+					if ($parseInfo['ref_type'] !== false) { // all after ON / USING
+						$parseInfo['ref_expr'] .= $token;
+					}
+					break;
 			}
 
 			switch ($upper) {
-			case 'AS':
-				$parseInfo['alias'] = array('as' => true, 'name' => "", 'base_expr' => $token);
-				$parseInfo['token_count']++;
-				$n = 1;
-				$str = "";
-				while ($str == "") {
-					$parseInfo['alias']['base_expr'] .= ($tokens[$i + $n] === "" ? " " : $tokens[$i + $n]);
-					$str = trim($tokens[$i + $n]);
-					++$n;
-				}
-				$parseInfo['alias']['name'] = $str;
-				$parseInfo['alias']['base_expr'] = trim($parseInfo['alias']['base_expr']);
-				continue;
-
-			case 'INDEX':
-				if (!empty($token_category) && $token_category == 'CREATE') {
-					$token_category = $upper;
-					continue 2;
-				}
+				case 'AS':
+					$parseInfo['alias'] = array('as' => true, 'name' => "", 'base_expr' => $token);
+					$parseInfo['token_count']++;
+					$n = 1;
+					$str = "";
+					while ($str == "") {
+						$parseInfo['alias']['base_expr'] .= ($tokens[$i + $n] === "" ? " " : $tokens[$i + $n]);
+						$str = trim($tokens[$i + $n]);
+						++$n;
+					}
+					$parseInfo['alias']['name'] = $str;
+					$parseInfo['alias']['base_expr'] = trim($parseInfo['alias']['base_expr']);
+					continue;
 
-				break;
+				case 'INDEX':
+					if (!empty($token_category) && $token_category == 'CREATE') {
+						$token_category = $upper;
+						continue 2;
+					}
 
-			case 'USING':
-			case 'ON':
-				$parseInfo['ref_type'] = $upper;
-				$parseInfo['ref_expr'] = "";
-				$parseInfo['token_count']++;
-				continue;
+					break;
 
-			case 'USE':
-			case 'FORCE':
-			case 'IGNORE':
-				$tableOptions = array('option' => $upper, 'name' => $upper, 'expr_type' => 'index_hints', 'base_expr' => $token);
-				$parseInfo['token_count']++;
-				$n = 1;
-				$tokenCount = count($token);
+				case 'USING':
+				case 'ON':
+					$parseInfo['ref_type'] = $upper;
+					$parseInfo['ref_expr'] = "";
+					$parseInfo['token_count']++;
+					continue;
 
-				while ($tokenCount < ($i + $n))
-				{
-					$tableOptions['base_expr'] .= ($tokens[$i + $n] === "" ? " " : $tokens[$i + $n]);
+				case 'USE':
+				case 'FORCE':
+				case 'IGNORE':
+					$tableOptions = array('option' => $upper, 'name' => $upper, 'expr_type' => 'index_hints', 'base_expr' => $token);
+					$parseInfo['token_count']++;
+					$n = 1;
+					$tokenCount = count($token);
 
-					if (strpos($tokens[$i + $n], ')') !== false)
+					while ($tokenCount < ($i + $n))
 					{
-						break;
-					}
+						$tableOptions['base_expr'] .= ($tokens[$i + $n] === "" ? " " : $tokens[$i + $n]);
 
-					++$n;
-				}
+						if (strpos($tokens[$i + $n], ')') !== false)
+						{
+							break;
+						}
 
-				$parseInfo['index_hints'] = $tableOptions;
-				continue;
-				break;
+						++$n;
+					}
 
-			case 'CROSS':
-			case 'INNER':
-			case 'OUTER':
-				$parseInfo['token_count']++;
-				continue;
+					$parseInfo['index_hints'] = $tableOptions;
+					continue;
+					break;
 
-			case 'FOR':
-				$parseInfo['token_count']++;
-				$skip_next = true;
-				continue;
+				case 'CROSS':
+				case 'INNER':
+				case 'OUTER':
+					$parseInfo['token_count']++;
+					continue;
 
-			case 'LEFT':
-			case 'RIGHT':
-			case 'STRAIGHT_JOIN':
-				$parseInfo['next_join_type'] = $upper;
-				break;
+				case 'FOR':
+					$parseInfo['token_count']++;
+					$skip_next = true;
+					continue;
 
-			case ',':
-				$parseInfo['next_join_type'] = 'CROSS';
+				case 'LEFT':
+				case 'RIGHT':
+				case 'STRAIGHT_JOIN':
+					$parseInfo['next_join_type'] = $upper;
+					break;
 
-			case 'JOIN':
-				if ($parseInfo['subquery']) {
-					$parseInfo['sub_tree'] = $this->parse($this->removeParenthesisFromStart($parseInfo['subquery']));
-					$parseInfo['expression'] = $parseInfo['subquery'];
-				}
+				case ',':
+					$parseInfo['next_join_type'] = 'CROSS';
 
-				$expr[] = $this->processFromExpression($parseInfo);
-				$parseInfo = $this->initParseInfoForFrom($parseInfo);
-				break;
+				case 'JOIN':
+					if ($parseInfo['subquery']) {
+						$parseInfo['sub_tree'] = $this->parse($this->removeParenthesisFromStart($parseInfo['subquery']));
+						$parseInfo['expression'] = $parseInfo['subquery'];
+					}
 
-			default:
-				if ($upper === "") {
-					continue; // ends the switch statement!
-				}
+					$expr[] = $this->processFromExpression($parseInfo);
+					$parseInfo = $this->initParseInfoForFrom($parseInfo);
+					break;
 
-				if ($parseInfo['token_count'] === 0) {
-					if ($parseInfo['table'] === "") {
-						$parseInfo['table'] = $token;
+				default:
+					if ($upper === "") {
+						continue; // ends the switch statement!
 					}
-				} else if ($parseInfo['token_count'] === 1) {
-					$parseInfo['alias'] = array('as' => false, 'name' => trim($token), 'base_expr' => trim($token));
-				}
-				$parseInfo['token_count']++;
-				break;
+
+					if ($parseInfo['token_count'] === 0) {
+						if ($parseInfo['table'] === "") {
+							$parseInfo['table'] = $token;
+						}
+					} else if ($parseInfo['token_count'] === 1) {
+						$parseInfo['alias'] = array('as' => false, 'name' => trim($token), 'base_expr' => trim($token));
+					}
+					$parseInfo['token_count']++;
+					break;
 			}
 			++$i;
 		}
@@ -1105,21 +1105,21 @@ 
 		foreach ($tokens as $token) {
 			$upper = strtoupper(trim($token));
 			switch ($upper) {
-			case ',':
-				$out[] = $this->processOrderExpression($parseInfo, $select);
-				$parseInfo = $this->initParseInfoForOrder();
-				break;
+				case ',':
+					$out[] = $this->processOrderExpression($parseInfo, $select);
+					$parseInfo = $this->initParseInfoForOrder();
+					break;
 
-			case 'DESC':
-				$parseInfo['dir'] = "DESC";
-				break;
+				case 'DESC':
+					$parseInfo['dir'] = "DESC";
+					break;
 
-			case 'ASC':
-				$parseInfo['dir'] = "ASC";
-				break;
+				case 'ASC':
+					$parseInfo['dir'] = "ASC";
+					break;
 
-			default:
-				$parseInfo['expr'] .= $token;
+				default:
+					$parseInfo['expr'] .= $token;
 
 			}
 		}
@@ -1140,16 +1140,16 @@ 
 		foreach ($tokens as $token) {
 			$trim = strtoupper(trim($token));
 			switch ($trim) {
-			case ',':
-				$parsed = $this->processOrderExpression($parseInfo, $select, true);
-				unset($parsed['direction']);
+				case ',':
+					$parsed = $this->processOrderExpression($parseInfo, $select, true);
+					unset($parsed['direction']);
 
-				$out[] = $parsed;
-				$parseInfo = $this->initParseInfoForOrder();
-				break;
-			default:
-				$parseInfo['base_expr'] .= $token;
-				$parseInfo['expr'] .= $token;
+					$out[] = $parsed;
+					$parseInfo = $this->initParseInfoForOrder();
+					break;
+				default:
+					$parseInfo['base_expr'] .= $token;
+					$parseInfo['expr'] .= $token;
 			}
 		}
 
@@ -1311,116 +1311,116 @@ 
 				/* it is either an operator, a colref or a constant */
 				switch ($parseInfo['upper']) {
 
-				case '*':
-					$parseInfo['processed'] = false; // no subtree
-
-					// last token is colref, const or expression
-					// it is an operator, in all other cases it is an all-columns-alias
-					// if the previous colref ends with a dot, the * is the all-columns-alias
-					if (!is_array($parseInfo['expr'])) {
-						$parseInfo['tokenType'] = "colref"; // single or first element of select -> *
-						break;
-					}
-
-					$last = array_pop($parseInfo['expr']);
-					if ($last['expr_type'] !== 'colref' && $last['expr_type'] !== 'const'
-							&& $last['expr_type'] !== 'expression') {
-						$parseInfo['expr'][] = $last;
-						$parseInfo['tokenType'] = "colref";
-						break;
-					}
-
-					if ($last['expr_type'] === 'colref' && substr($last['base_expr'], -1, 1) === ".") {
-						$last['base_expr'] .= '*'; // tablealias dot *
-						$parseInfo['expr'][] = $last;
-						continue 2;
-					}
+					case '*':
+						$parseInfo['processed'] = false; // no subtree
 
-					$parseInfo['expr'][] = $last;
-					$parseInfo['tokenType'] = "operator";
-					break;
+						// last token is colref, const or expression
+						// it is an operator, in all other cases it is an all-columns-alias
+						// if the previous colref ends with a dot, the * is the all-columns-alias
+						if (!is_array($parseInfo['expr'])) {
+							$parseInfo['tokenType'] = "colref"; // single or first element of select -> *
+							break;
+						}
 
-				case 'AND':
-				case '&&':
-				case 'BETWEEN':
-				case 'BINARY':
-				case '&':
-				case '~':
-				case '|':
-				case '^':
-				case 'DIV':
-				case '/':
-				case '<=>':
-				case '=':
-				case '>=':
-				case '>':
-				case 'IS':
-				case 'NOT':
-				case '<<':
-				case '<=':
-				case '<':
-				case 'LIKE':
-				case '%':
-				case '!=':
-				case '<>':
-				case 'REGEXP':
-				case '!':
-				case '||':
-				case 'OR':
-				case '>>':
-				case 'RLIKE':
-				case 'SOUNDS':
-				case 'XOR':
-				case 'IN':
-					$parseInfo['processed'] = false;
-					$parseInfo['tokenType'] = "operator";
-					break;
+						$last = array_pop($parseInfo['expr']);
+						if ($last['expr_type'] !== 'colref' && $last['expr_type'] !== 'const'
+								&& $last['expr_type'] !== 'expression') {
+							$parseInfo['expr'][] = $last;
+							$parseInfo['tokenType'] = "colref";
+							break;
+						}
 
-				case 'NULL':
-					$parseInfo['processed'] = false;
-					$parseInfo['tokenType'] = 'const';
-					break;
+						if ($last['expr_type'] === 'colref' && substr($last['base_expr'], -1, 1) === ".") {
+							$last['base_expr'] .= '*'; // tablealias dot *
+							$parseInfo['expr'][] = $last;
+							continue 2;
+						}
 
-				case '-':
-				case '+':
-				// differ between preceding sign and operator
-					$parseInfo['processed'] = false;
+						$parseInfo['expr'][] = $last;
+						$parseInfo['tokenType'] = "operator";
+						break;
 
-					if ($parseInfo['prevTokenType'] === 'colref' || $parseInfo['prevTokenType'] === 'function'
-							|| $parseInfo['prevTokenType'] === 'aggregate_function'
-							|| $parseInfo['prevTokenType'] === 'const'
-							|| $parseInfo['prevTokenType'] === 'subquery') {
+					case 'AND':
+					case '&&':
+					case 'BETWEEN':
+					case 'BINARY':
+					case '&':
+					case '~':
+					case '|':
+					case '^':
+					case 'DIV':
+					case '/':
+					case '<=>':
+					case '=':
+					case '>=':
+					case '>':
+					case 'IS':
+					case 'NOT':
+					case '<<':
+					case '<=':
+					case '<':
+					case 'LIKE':
+					case '%':
+					case '!=':
+					case '<>':
+					case 'REGEXP':
+					case '!':
+					case '||':
+					case 'OR':
+					case '>>':
+					case 'RLIKE':
+					case 'SOUNDS':
+					case 'XOR':
+					case 'IN':
+						$parseInfo['processed'] = false;
 						$parseInfo['tokenType'] = "operator";
-					} else {
-						$parseInfo['tokenType'] = "sign";
-					}
-					break;
+						break;
 
-				default:
-					switch ($parseInfo['token'][0]) {
-					case "'":
-					case '"':
+					case 'NULL':
+						$parseInfo['processed'] = false;
 						$parseInfo['tokenType'] = 'const';
 						break;
-					case '`':
-						$parseInfo['tokenType'] = 'colref';
-						break;
 
-					default:
-						if (is_numeric($parseInfo['token'])) {
-							$parseInfo['tokenType'] = 'const';
-
-							if ($parseInfo['prevTokenType'] === 'sign') {
-								array_pop($parseInfo['expr']);
-								$parseInfo['token'] = $parseInfo['prevToken'] . $parseInfo['token'];
-							}
+					case '-':
+					case '+':
+					// differ between preceding sign and operator
+						$parseInfo['processed'] = false;
 
+						if ($parseInfo['prevTokenType'] === 'colref' || $parseInfo['prevTokenType'] === 'function'
+								|| $parseInfo['prevTokenType'] === 'aggregate_function'
+								|| $parseInfo['prevTokenType'] === 'const'
+								|| $parseInfo['prevTokenType'] === 'subquery') {
+							$parseInfo['tokenType'] = "operator";
 						} else {
-							$parseInfo['tokenType'] = 'colref';
+							$parseInfo['tokenType'] = "sign";
 						}
 						break;
 
-					}
+					default:
+						switch ($parseInfo['token'][0]) {
+							case "'":
+							case '"':
+								$parseInfo['tokenType'] = 'const';
+								break;
+							case '`':
+								$parseInfo['tokenType'] = 'colref';
+								break;
+
+							default:
+								if (is_numeric($parseInfo['token'])) {
+									$parseInfo['tokenType'] = 'const';
+
+									if ($parseInfo['prevTokenType'] === 'sign') {
+										array_pop($parseInfo['expr']);
+										$parseInfo['token'] = $parseInfo['prevToken'] . $parseInfo['token'];
+									}
+
+								} else {
+									$parseInfo['tokenType'] = 'colref';
+								}
+								break;
+
+						}
 					$parseInfo['processed'] = false;
 				}
 			}
@@ -1431,36 +1431,36 @@ 
 					&& in_array($parseInfo['upper'], parent::$reserved)) {
 
 				switch ($parseInfo['upper']) {
-				case 'AVG':
-				case 'SUM':
-				case 'COUNT':
-				case 'MIN':
-				case 'MAX':
-				case 'STDDEV':
-				case 'STDDEV_SAMP':
-				case 'STDDEV_POP':
-				case 'VARIANCE':
-				case 'VAR_SAMP':
-				case 'VAR_POP':
-				case 'GROUP_CONCAT':
-				case 'BIT_AND':
-				case 'BIT_OR':
-				case 'BIT_XOR':
-					$parseInfo['tokenType'] = 'aggregate_function';
-					break;
+					case 'AVG':
+					case 'SUM':
+					case 'COUNT':
+					case 'MIN':
+					case 'MAX':
+					case 'STDDEV':
+					case 'STDDEV_SAMP':
+					case 'STDDEV_POP':
+					case 'VARIANCE':
+					case 'VAR_SAMP':
+					case 'VAR_POP':
+					case 'GROUP_CONCAT':
+					case 'BIT_AND':
+					case 'BIT_OR':
+					case 'BIT_XOR':
+						$parseInfo['tokenType'] = 'aggregate_function';
+						break;
 
-				case 'NULL':
-				// it is a reserved word, but we would like to have set it as constant
-					$parseInfo['tokenType'] = 'const';
-					break;
+					case 'NULL':
+					// it is a reserved word, but we would like to have set it as constant
+						$parseInfo['tokenType'] = 'const';
+						break;
 
-				default:
-					if (in_array($parseInfo['upper'], parent::$functions)) {
-						$parseInfo['tokenType'] = 'function';
-					} else {
-						$parseInfo['tokenType'] = 'reserved';
-					}
-					break;
+					default:
+						if (in_array($parseInfo['upper'], parent::$functions)) {
+							$parseInfo['tokenType'] = 'function';
+						} else {
+							$parseInfo['tokenType'] = 'reserved';
+						}
+						break;
 				}
 			}
 

Braces +8 added lines, -6 removed lines

@@ -1060,10 +1060,11 @@ 
 			return false;
 		}
 
-		if ($groupby)
-			$parseInfo['expr'] = trim($parseInfo['expr']);
-		else
-			$parseInfo['expr'] = trim($this->revokeEscaping($parseInfo['expr']));
+		if ($groupby) {
+					$parseInfo['expr'] = trim($parseInfo['expr']);
+		} else {
+					$parseInfo['expr'] = trim($this->revokeEscaping($parseInfo['expr']));
+		}
 
 		if (is_numeric($parseInfo['expr'])) {
 			$parseInfo['type'] = 'pos';
@@ -1510,8 +1511,9 @@ 
 
 		$into = $tokens['INTO'];
 		foreach ($into as $token) {
-			if (trim($token) === "")
-				continue;
+			if (trim($token) === "") {
+							continue;
+			}
 			if ($table === "") {
 				$table = $token;
 			} elseif (empty($cols)) {