diff options
| author | Bruno Perel <brunoperel@gmail.com> | 2018-11-26 19:56:17 +0100 |
|---|---|---|
| committer | Bruno Perel <brunoperel@gmail.com> | 2018-11-26 20:08:52 +0100 |
| commit | 513ed8175bdc0fc17a192ea29757cf8fee178c2a (patch) | |
| tree | c87f72dcdc4d5f6f86e5da4d212e7be92cf9506c /src/Utils/Misc.php | |
| parent | 8e37bb398b9bf7449c6855f3e0639156cef35e7e (diff) | |
| download | sql-parser-513ed8175bdc0fc17a192ea29757cf8fee178c2a.zip sql-parser-513ed8175bdc0fc17a192ea29757cf8fee178c2a.tar.gz sql-parser-513ed8175bdc0fc17a192ea29757cf8fee178c2a.tar.bz2 | |
Cleanup and improve readability:
Avoid duplicate if conditions
Use switch/case instead of ifs when possible
Diffstat (limited to 'src/Utils/Misc.php')
| -rw-r--r-- | src/Utils/Misc.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Utils/Misc.php b/src/Utils/Misc.php index 9374db3..387600f 100644 --- a/src/Utils/Misc.php +++ b/src/Utils/Misc.php @@ -29,8 +29,8 @@ class Misc public static function getAliases($statement, $database) { if (!($statement instanceof SelectStatement) - || (empty($statement->expr)) - || (empty($statement->from)) + || empty($statement->expr) + || empty($statement->from) ) { return array(); } @@ -55,11 +55,11 @@ class Misc } foreach ($expressions as $expr) { - if ((!isset($expr->table)) || ($expr->table === '')) { + if (!isset($expr->table) || ($expr->table === '')) { continue; } - $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ? + $thisDb = (isset($expr->database) && ($expr->database !== '')) ? $expr->database : $database; if (!isset($retval[$thisDb])) { @@ -71,7 +71,7 @@ class Misc if (!isset($retval[$thisDb]['tables'][$expr->table])) { $retval[$thisDb]['tables'][$expr->table] = array( - 'alias' => ((isset($expr->alias)) && ($expr->alias !== '')) ? + 'alias' => (isset($expr->alias) && ($expr->alias !== '')) ? $expr->alias : null, 'columns' => array(), ); @@ -84,16 +84,15 @@ class Misc } foreach ($statement->expr as $expr) { - if ((!isset($expr->column)) || ($expr->column === '') - || (!isset($expr->alias)) || ($expr->alias === '') + if (!isset($expr->column, $expr->alias) || ($expr->column === '') || ($expr->alias === '') ) { continue; } - $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ? + $thisDb = (isset($expr->database) && ($expr->database !== '')) ? $expr->database : $database; - if ((isset($expr->table)) && ($expr->table !== '')) { + if (isset($expr->table) && ($expr->table !== '')) { $thisTable = isset($tables[$thisDb][$expr->table]) ? $tables[$thisDb][$expr->table] : $expr->table; $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias; |