Added new method 'highlight' that only does syntax highlighting and

preserves original whitespace.

3 files changed, 78 insertions, 1 deletions

diff --git a/README.md b/README.md
index 0d0858a..21b13f5 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,22 @@ Sample usage:
     <?php
     require_once('SqlFormatter.php');
     
-    echo SqlFormatter::format("SELECT * FROM Table LIMIT 10");
+    echo SqlFormatter::format("SELECT * FROM MyTable LIMIT 10");
     ?>
 
 Sample output:
 
 ![](http://github.com/jdorn/sql-formatter/raw/master/examples/SqlFormatterExample.png)
+
+Syntax Highlighting Only
+-------------------------
+
+There is also a static method 'highlight' that only does syntax highlighting 
+and preserves all original whitespace.
+
+This is useful for sql that is already well formatted and just needs to be a little
+easier to read.
+
+    <?php
+    echo SqlFormatter::highlight("SELECT * FROM MyTable LIMIT 10");
+    ?>
diff --git a/SqlFormatter.php b/SqlFormatter.php
index 7c9b37d..d7db83d 100644
--- a/SqlFormatter.php
+++ b/SqlFormatter.php
@@ -307,5 +307,62 @@ class SqlFormatter {
 		
 		return "<pre style='background:white;'>".trim($return)."</pre>";
 	}
+	
+	public static function highlight($string) {
+		$old_string_len = strlen($string) + 1;
+		
+		//keep processing the string until it is empty
+		while(strlen($string)) {
+			//if the string stopped shrinking, there was a problem
+			if($old_string_len <= strlen($string)) {
+				throw new Exception("SQL PARSE ERROR");
+			}
+			$old_string_len = strlen($string);
+			
+			//get the next token and the token type
+			$type = null;
+			$raw_token = self::getNextToken($string,$type);
+			$next_token = htmlentities($raw_token);
+			
+			//advance the string forward
+			$string = substr($string,strlen($raw_token));
+			
+			switch($type) {
+				case 'backtick quote':
+					$return .= "<span style='".self::$backtick_quote_style."'>".$next_token."</span>";
+					break;
+				case 'quote':
+					$return .= "<span style='".self::$quote_style."'>".$next_token."</span>";
+					break;
+				case 'reserved':
+				case 'special reserved':
+					$return .= "<span style='".self::$reserved_style."'>".$next_token."</span>";
+					break;
+				case '(':
+					$return .= '(';
+					break;
+				case ')':
+					$return .= ")";
+					break;
+				case 'number':
+					$return .= "<span style='".self::$number_style."'>".$next_token."</span>";
+					break;
+				case 'boundary':
+				case '.':
+				case ',':				
+					$return .= "<span style='".self::$boundary_style."'>".$next_token."</span>";					
+					break;
+				case 'comment':
+				case 'block comment':
+					$return .= "<span style='".self::$comment_style."'>".$next_token."</span>";
+					break;
+				default:
+					$return .= "<span style='".self::$default_style."'>".$next_token."</span>";
+			}
+		}
+		
+		return "<pre style='background:white;'>".trim($return)."</pre>";
+			
+	}
 }
 ?>
diff --git a/examples/examples.php b/examples/examples.php
index df198c3..f8bf524 100644
--- a/examples/examples.php
+++ b/examples/examples.php
@@ -27,8 +27,15 @@ $statements = array(
 	as temp, DateCreated as Created FROM MyTable;",
 );
 
+echo "<h1>Formatting</h1>";
 foreach($statements as $sql) {
 	echo "<hr />";
 	echo SqlFormatter::format($sql);
 }
+
+echo "<h1>Syntax Highlighting Only</h1>";
+foreach($statements as $sql) {
+	echo "<hr />";
+	echo SqlFormatter::highlight($sql);
+}
 ?>