implemented drop, working on minifier

Author: Pamblam

Gruntfile.js

@@ -35,6 +35,7 @@ module.exports = function(grunt) {
 					'src/parser/jSQLParseSelectTokens.js',
 					'src/parser/jSQLParseUpdateTokens.js',
 					'src/parser/jSQLParseDeleteTokens.js',
+					'src/parser/jSQLParseDropTokens.js',
 					'src/parser/jSQLParseWhereClause.js',
 					'src/parser/jSQLWhereClause.js',
 					'src/persistence/API.js',

jSQL.js

@@ -1325,7 +1325,7 @@ function jSQLParseQuery(query){
 			return jSQLParseDeleteTokens(tokens);
 			break;
 		case "DROP TABLE":
-			
+			return jSQLParseDropTokens(tokens);
 			break;
 	}
 
@@ -1616,6 +1616,12 @@ function jSQLParseDeleteTokens(tokens){
 	return query;
 }
 
+function jSQLParseDropTokens(tokens){
+	var token = tokens.shift();
+	var table_name = jSQLParseQuery.validateTableNameToken(token);
+	return jSQL.dropTable(table_name);
+}
+
 function jSQLParseWhereClause(query, tokens, table_name){
 	var orderColumns = [];
 	while(tokens.length){
@@ -2676,66 +2682,10 @@ function jSQLReset(){
 }
 
 function jSQLMinifier(sql){
-	var cleanSQL = "";
-	var lines = sql.split("\n");
-	var inQuote = false;
-	var quoteType = "";
-	var quotes = ["'", "`", '"'];
-	var inMultiLineComment = false;
-	for (var i = 0; i < lines.length; i++) {
-		for (var n = 0; n < lines[i].length; n++) {
-			var char = lines[i][n];
-			if (!inQuote && quotes.indexOf(char) > -1) {
-				inQuote = true;
-				quoteType = char;
-				cleanSQL += char;
-				continue;
-			} else if (inQuote && quoteType === char) {
-				inQuote = false;
-				quoteType = "";
-				cleanSQL += char;
-				continue;
-			} else if (inQuote) {
-				cleanSQL += char;
-				continue;
-			}
-			// not in a quote
-			var isCommentStart =
-					char === "/" &&
-					lines[i].length > n &&
-					lines[i][n + 1] == "*"
-			var isCommentEnd =
-					char === "*" &&
-					lines[i].length > n &&
-					lines[i][n + 1] == "/"
-			if (!inMultiLineComment && isCommentStart) {
-				inMultiLineComment = true;
-				continue;
-			} else if (isCommentEnd && inMultiLineComment) {
-				n++;
-				inMultiLineComment = false;
-				continue;
-			}
-			if (inMultiLineComment)
-				continue;
-			// not in multiline comment
-			var isSLCommentStart =
-					char === "#" ||
-					(char === "-" &&
-							lines[i].length > n &&
-							lines[i][n + 1] == "-");
-			if (isSLCommentStart)
-				break;
-			else
-				cleanSQL += char;
-		}
-		cleanSQL += "\n";
-	}
-	return cleanSQL
-		.replace(/\t/g,' ')
-		.replace(/(\r\n|\n|\r)/gm," ")
-		.replace(/ +(?= )/g,'')
-		.trim();
+	var tokens = new jSQLLexer(sql).getTokens();
+	var minified_sql = [];
+	for(var i=0;i<tokens.length;i++) minified_sql.push(tokens[i].literal);
+	return minified_sql.join(' ');
 }
 
 function removeQuotes(str){

jSQL.min.js

@@ -1,63 +1,7 @@
 
 function jSQLMinifier(sql){
-	var cleanSQL = "";
-	var lines = sql.split("\n");
-	var inQuote = false;
-	var quoteType = "";
-	var quotes = ["'", "`", '"'];
-	var inMultiLineComment = false;
-	for (var i = 0; i < lines.length; i++) {
-		for (var n = 0; n < lines[i].length; n++) {
-			var char = lines[i][n];
-			if (!inQuote && quotes.indexOf(char) > -1) {
-				inQuote = true;
-				quoteType = char;
-				cleanSQL += char;
-				continue;
-			} else if (inQuote && quoteType === char) {
-				inQuote = false;
-				quoteType = "";
-				cleanSQL += char;
-				continue;
-			} else if (inQuote) {
-				cleanSQL += char;
-				continue;
-			}
-			// not in a quote
-			var isCommentStart =
-					char === "/" &&
-					lines[i].length > n &&
-					lines[i][n + 1] == "*"
-			var isCommentEnd =
-					char === "*" &&
-					lines[i].length > n &&
-					lines[i][n + 1] == "/"
-			if (!inMultiLineComment && isCommentStart) {
-				inMultiLineComment = true;
-				continue;
-			} else if (isCommentEnd && inMultiLineComment) {
-				n++;
-				inMultiLineComment = false;
-				continue;
-			}
-			if (inMultiLineComment)
-				continue;
-			// not in multiline comment
-			var isSLCommentStart =
-					char === "#" ||
-					(char === "-" &&
-							lines[i].length > n &&
-							lines[i][n + 1] == "-");
-			if (isSLCommentStart)
-				break;
-			else
-				cleanSQL += char;
-		}
-		cleanSQL += "\n";
-	}
-	return cleanSQL
-		.replace(/\t/g,' ')
-		.replace(/(\r\n|\n|\r)/gm," ")
-		.replace(/ +(?= )/g,'')
-		.trim();
+	var tokens = new jSQLLexer(sql).getTokens();
+	var minified_sql = [];
+	for(var i=0;i<tokens.length;i++) minified_sql.push(tokens[i].literal);
+	return minified_sql.join(' ');
 }