diff options
| author | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-09-02 09:13:55 -0700 |
|---|---|---|
| committer | Jeremy Dorn <jeremy@jeremydorn.com> | 2013-09-02 09:13:55 -0700 |
| commit | 0b30579a48dc7deaa3905ea7d6a457998e33e5a8 (patch) | |
| tree | 6d4514804330cd30eda7515417c2deff9b8347cd /lib/SqlFormatter.php | |
| parent | bccca26bfe75b30aba71c2f734e9f9dd854a85f6 (diff) | |
| download | sql-formatter-0b30579a48dc7deaa3905ea7d6a457998e33e5a8.zip sql-formatter-0b30579a48dc7deaa3905ea7d6a457998e33e5a8.tar.gz sql-formatter-0b30579a48dc7deaa3905ea7d6a457998e33e5a8.tar.bz2 | |
Made compress remove extra whitespace from reserved words. Fixes #51
```sql
LEFT
OUTER
JOIN
```
becomes
```sql
LEFT OUTER JOIN
```
Diffstat (limited to 'lib/SqlFormatter.php')
| -rw-r--r-- | lib/SqlFormatter.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php index 10db252..be326f0 100644 --- a/lib/SqlFormatter.php +++ b/lib/SqlFormatter.php @@ -9,7 +9,7 @@ * @copyright 2013 Jeremy Dorn * @license http://opensource.org/licenses/MIT * @link http://github.com/jdorn/sql-formatter - * @version 1.2.11 + * @version 1.2.12 */ class SqlFormatter { @@ -766,6 +766,10 @@ class SqlFormatter if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_COMMENT || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_BLOCK_COMMENT) { continue; } + // Remove extra whitespace in reserved words (e.g "OUTER JOIN" becomes "OUTER JOIN") + elseif ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_NEWLINE || $token[self::TOKEN_TYPE] === self::TOKEN_TYPE_RESERVED_TOPLEVEL) { + $token[self::TOKEN_VALUE] = preg_replace('/\s+/',' ',$token[self::TOKEN_VALUE]); + } if ($token[self::TOKEN_TYPE] === self::TOKEN_TYPE_WHITESPACE) { // If the last token was whitespace, don't add another one |