summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradityagoyal <ang.adityagoyal@yahoo.com>2013-06-30 14:56:53 +0530
committeradityagoyal <ang.adityagoyal@yahoo.com>2013-06-30 14:56:53 +0530
commit6974c23faa4bbac4c85e5c8a14760b1d99182e7e (patch)
tree90a5d8560ba35b2dffdd64c113b906a433a71f10
parent33d79737c077ba9d5606bcfa398e8926dc56f1cf (diff)
downloadsql-formatter-6974c23faa4bbac4c85e5c8a14760b1d99182e7e.zip
sql-formatter-6974c23faa4bbac4c85e5c8a14760b1d99182e7e.tar.gz
sql-formatter-6974c23faa4bbac4c85e5c8a14760b1d99182e7e.tar.bz2
removed XOR as it was there in reserved newline.Added LEFT OUTER JOIN and RIGHT OUTER JOIN in newline.
removed XOR as it was there in reserved newline.Added LEFT OUTER JOIN and RIGHT OUTER JOIN in newline.
-rw-r--r--lib/SqlFormatter.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/SqlFormatter.php b/lib/SqlFormatter.php
index 0395209..edd6198 100644
--- a/lib/SqlFormatter.php
+++ b/lib/SqlFormatter.php
@@ -57,7 +57,7 @@ class SqlFormatter
'SQL_SMALL_RESULT', 'SQL_WARNINGS', 'SQL_CACHE', 'SQL_NO_CACHE', 'START', 'STARTING', 'STATUS', 'STOP', 'STORAGE',
'STRAIGHT_JOIN', 'STRING', 'STRIPED', 'SUPER', 'TABLE', 'TABLES', 'TEMPORARY', 'TERMINATED', 'THEN', 'TO', 'TRAILING', 'TRANSACTIONAL', 'TRUE',
'TRUNCATE', 'TYPE', 'TYPES', 'UNCOMMITTED', 'UNIQUE', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USE', 'USING', 'VARIABLES',
- 'VIEW', 'WHEN', 'WITH', 'WORK', 'WRITE', 'XOR', 'YEAR_MONTH'
+ 'VIEW', 'WHEN', 'WITH', 'WORK', 'WRITE', 'YEAR_MONTH'
);
// For SQL formatting
@@ -68,7 +68,7 @@ class SqlFormatter
);
protected static $reserved_newline = array(
- 'LEFT JOIN', 'RIGHT JOIN', 'OUTER JOIN', 'INNER JOIN', 'JOIN', 'XOR', 'OR', 'AND'
+ 'LEFT OUTER JOIN', 'RIGHT OUTER JOIN', 'LEFT JOIN', 'RIGHT JOIN', 'OUTER JOIN', 'INNER JOIN', 'JOIN', 'XOR', 'OR', 'AND'
);
// Punctuation that can be used as a boundary between other tokens