diff options
Diffstat (limited to 'includes/database/select.inc')
-rw-r--r-- | includes/database/select.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc index cebeef7ad..3eddd3ad7 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -1285,6 +1285,11 @@ class SelectQuery extends Query implements SelectQueryInterface { // FIELDS and EXPRESSIONS $fields = array(); + foreach ($this->tables as $alias => $table) { + if (!empty($table['all_fields'])) { + $fields[] = $alias . '.*'; + } + } foreach ($this->fields as $alias => $field) { // Always use the AS keyword for field aliases, as some // databases require it (e.g., PostgreSQL). @@ -1293,11 +1298,6 @@ class SelectQuery extends Query implements SelectQueryInterface { foreach ($this->expressions as $alias => $expression) { $fields[] = $expression['expression'] . ' AS ' . $expression['alias']; } - foreach ($this->tables as $alias => $table) { - if (!empty($table['all_fields'])) { - $fields[] = $alias . '.*'; - } - } $query .= implode(', ', $fields); |