@@ -82,30 +82,30 @@ |
||
| 82 | 82 | * @var array |
| 83 | 83 | */ |
| 84 | 84 | public static $CLAUSES = array( |
| 85 | - 'SELECT' => array('SELECT', 2), |
|
| 85 | + 'SELECT' => array('SELECT', 2), |
|
| 86 | 86 | // Used for options. |
| 87 | - '_OPTIONS' => array('_OPTIONS', 1), |
|
| 87 | + '_OPTIONS' => array('_OPTIONS', 1), |
|
| 88 | 88 | // Used for selected expressions. |
| 89 | - '_SELECT' => array('SELECT', 1), |
|
| 90 | - 'INTO' => array('INTO', 3), |
|
| 91 | - 'FROM' => array('FROM', 3), |
|
| 92 | - 'PARTITION' => array('PARTITION', 3), |
|
| 93 | - |
|
| 94 | - 'JOIN' => array('JOIN', 1), |
|
| 95 | - 'FULL JOIN' => array('FULL JOIN', 1), |
|
| 96 | - 'INNER JOIN' => array('INNER JOIN', 1), |
|
| 97 | - 'LEFT JOIN' => array('LEFT JOIN', 1), |
|
| 98 | - 'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1), |
|
| 99 | - 'RIGHT JOIN' => array('RIGHT JOIN', 1), |
|
| 100 | - 'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1), |
|
| 101 | - |
|
| 102 | - 'WHERE' => array('WHERE', 3), |
|
| 103 | - 'GROUP BY' => array('GROUP BY', 3), |
|
| 104 | - 'HAVING' => array('HAVING', 3), |
|
| 105 | - 'ORDER BY' => array('ORDER BY', 3), |
|
| 106 | - 'LIMIT' => array('LIMIT', 3), |
|
| 107 | - 'PROCEDURE' => array('PROCEDURE', 3), |
|
| 108 | - 'UNION' => array('UNION', 1), |
|
| 89 | + '_SELECT' => array('SELECT', 1), |
|
| 90 | + 'INTO' => array('INTO', 3), |
|
| 91 | + 'FROM' => array('FROM', 3), |
|
| 92 | + 'PARTITION' => array('PARTITION', 3), |
|
| 93 | + |
|
| 94 | + 'JOIN' => array('JOIN', 1), |
|
| 95 | + 'FULL JOIN' => array('FULL JOIN', 1), |
|
| 96 | + 'INNER JOIN' => array('INNER JOIN', 1), |
|
| 97 | + 'LEFT JOIN' => array('LEFT JOIN', 1), |
|
| 98 | + 'LEFT OUTER JOIN' => array('LEFT OUTER JOIN', 1), |
|
| 99 | + 'RIGHT JOIN' => array('RIGHT JOIN', 1), |
|
| 100 | + 'RIGHT OUTER JOIN' => array('RIGHT OUTER JOIN', 1), |
|
| 101 | + |
|
| 102 | + 'WHERE' => array('WHERE', 3), |
|
| 103 | + 'GROUP BY' => array('GROUP BY', 3), |
|
| 104 | + 'HAVING' => array('HAVING', 3), |
|
| 105 | + 'ORDER BY' => array('ORDER BY', 3), |
|
| 106 | + 'LIMIT' => array('LIMIT', 3), |
|
| 107 | + 'PROCEDURE' => array('PROCEDURE', 3), |
|
| 108 | + 'UNION' => array('UNION', 1), |
|
| 109 | 109 | // These are available only when `UNION` is present. |
| 110 | 110 | // 'ORDER BY' => array('ORDER BY', 3), |
| 111 | 111 | // 'LIMIT' => array('LIMIT', 3), |
@@ -141,12 +141,12 @@ |
||
| 141 | 141 | { |
| 142 | 142 | if ($component->dest instanceof Expression) { |
| 143 | 143 | $columns = !empty($component->columns) ? |
| 144 | - '(`' . implode('`, `', $component->columns) . '`)' : ''; |
|
| 145 | - return $component->dest . $columns; |
|
| 146 | - } elseif (! empty($component->variables)) { |
|
| 147 | - return ' ' . implode(', ', $component->variables); |
|
| 144 | + '(`'.implode('`, `', $component->columns).'`)' : ''; |
|
| 145 | + return $component->dest.$columns; |
|
| 146 | + } elseif (!empty($component->variables)) { |
|
| 147 | + return ' '.implode(', ', $component->variables); |
|
| 148 | 148 | } else { |
| 149 | - return 'OUTFILE "' . $component->dest . '"'; |
|
| 149 | + return 'OUTFILE "'.$component->dest.'"'; |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | } |
@@ -183,11 +183,11 @@ |
||
| 183 | 183 | { |
| 184 | 184 | $ret = array(); |
| 185 | 185 | foreach ($component as $c) { |
| 186 | - $ret[] = array_search($c->type, static::$JOINS) . ' ' . $c->expr |
|
| 186 | + $ret[] = array_search($c->type, static::$JOINS).' '.$c->expr |
|
| 187 | 187 | . (!empty($c->on) |
| 188 | - ? ' ON ' . Condition::build($c->on) : '') |
|
| 188 | + ? ' ON '.Condition::build($c->on) : '') |
|
| 189 | 189 | . (!empty($c->using) |
| 190 | - ? ' USING ' . ArrayObj::build($c->using) : ''); |
|
| 190 | + ? ' USING '.ArrayObj::build($c->using) : ''); |
|
| 191 | 191 | } |
| 192 | 192 | return implode(' ', $ret); |
| 193 | 193 | } |