diff options
Diffstat (limited to 'src/Components/Expression.php')
| -rw-r--r-- | src/Components/Expression.php | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/Components/Expression.php b/src/Components/Expression.php index 09c1f91..a1b460b 100644 --- a/src/Components/Expression.php +++ b/src/Components/Expression.php @@ -418,28 +418,28 @@ class Expression extends Component { if (is_array($component)) { return implode($component, ', '); + } + + if ($component->expr !== '' && !is_null($component->expr)) { + $ret = $component->expr; } else { - if ($component->expr !== '' && !is_null($component->expr)) { - $ret = $component->expr; - } else { - $fields = array(); - if ((isset($component->database)) && ($component->database !== '')) { - $fields[] = $component->database; - } - if ((isset($component->table)) && ($component->table !== '')) { - $fields[] = $component->table; - } - if ((isset($component->column)) && ($component->column !== '')) { - $fields[] = $component->column; - } - $ret = implode('.', Context::escape($fields)); + $fields = array(); + if ((isset($component->database)) && ($component->database !== '')) { + $fields[] = $component->database; } - - if (!empty($component->alias)) { - $ret .= ' AS ' . Context::escape($component->alias); + if ((isset($component->table)) && ($component->table !== '')) { + $fields[] = $component->table; + } + if ((isset($component->column)) && ($component->column !== '')) { + $fields[] = $component->column; } + $ret = implode('.', Context::escape($fields)); + } - return $ret; + if (!empty($component->alias)) { + $ret .= ' AS ' . Context::escape($component->alias); } + + return $ret; } } |