LEFT JOINs start on a new line

Author: nicoder

README

@@ -2,7 +2,7 @@ Little tool meant to format a SQL query to be more readable.
 
 Install the folder on a web server with PHP installed and call index.php in a browser.
 
-Current features : 
+Current features (see unit tests): 
 - FROM and WHERE start on a new line
 - 'SELECT', 'FROM' and 'WHERE' keywords are uppercased
 

sqlFormatter.php

@@ -2,13 +2,23 @@
 
 class SqlFormatter
 {
+	private $_select;
+	private $_from;
+	private $_where;
+
 	public function format($sql)
 	{
 		$this->_separateSelectAndFrom($sql);
 		$this->_separateFromAndWhere();
+		$this->_formatFrom();
 		return $this->_assemble();
 	}
 
+	private function _formatFrom()
+	{
+		$this->_from = str_ireplace(' left join', "\nLEFT JOIN", $this->_from);
+	}
+	
 	private function _assemble()
 	{
 		$result = $this->_select . "\n" . $this->_from;

tests/.test.php.swp

@@ -41,4 +41,16 @@ public function keywordsAreUppercased()
 		$actual = $o->format($sql);
 		$this->assertEquals($expected, $actual);
 	}
+
+	/**
+	 * @test
+	 */
+	public function leftJoinStartsOnNewLine()
+	{
+		$sql = "SELECT a\nFROM t LEFT JOIN b ON t.a  = b.c WHERE b = c";
+		$expected = "SELECT a\nFROM t\nLEFT JOIN b ON t.a  = b.c\nWHERE b = c";
+		$o = new SqlFormatter();
+		$actual = $o->format($sql);
+		$this->assertEquals($expected, $actual);
+	}
 }