integrated some tests

Author: wumpz

src/test/java/net/sf/jsqlparser/test/TestUtils.java

@@ -81,7 +81,7 @@ public static void assertStatementCanBeDeparsedAs(Statement parsed, String state
     public static String buildSqlString(String sql, boolean laxDeparsingCheck) {
     	sql = SQL_COMMENT_PATTERN.matcher(sql).replaceAll("");
         if (laxDeparsingCheck) {
-            return sql.replaceAll("\\s", " ").replaceAll("\\s+", " ").replaceAll("\\s*([/,()=+\\-*|\\]<>])\\s*", "$1").toLowerCase().trim();
+            return sql.replaceAll("\\s", " ").replaceAll("\\s+", " ").replaceAll("\\s*([!/,()=+\\-*|\\]<>])\\s*", "$1").toLowerCase().trim();
         } else {
             return sql;
         }

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -2277,4 +2277,8 @@ public void testProblemSqlIssue330_2() throws JSQLParserException {
     public void testProblemKeywordCommitIssue341() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT id, commit FROM table1");
     }
+    
+    public void testProblemIsIssue331() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT C_DocType.C_DocType_ID,NULL,COALESCE(C_DocType_Trl.Name,C_DocType.Name) AS Name,C_DocType.IsActive FROM C_DocType LEFT JOIN C_DocType_TRL ON (C_DocType.C_DocType_ID=C_DocType_Trl.C_DocType_ID AND C_DocType_Trl.AD_Language='es_AR') WHERE C_DocType.AD_Client_ID=1010016 AND C_DocType.AD_Client_ID IN (0,1010016) AND C_DocType.c_doctype_id in ( select c_doctype2.c_doctype_id from c_doctype as c_doctype2 where substring( c_doctype2.printname,6, length(c_doctype2.printname) ) = ( select letra from c_letra_comprobante as clc where clc.c_letra_comprobante_id = 1010039) ) AND ( (1010094!=0 AND C_DocType.ad_org_id = 1010094) OR 1010094=0 ) ORDER BY 3 LIMIT 2000", true);
+    }
 }

src/test/java/net/sf/jsqlparser/test/update/UpdateTest.java

@@ -108,4 +108,8 @@ public void testUpdateDoesNotAllowLimitOffset() throws JSQLParserException {
 		parserManager.parse(new StringReader(statement));
 	}
 
+    @Test
+	public void testUpdateWithFunctions() throws JSQLParserException {
+		assertSqlCanBeParsedAndDeparsed("UPDATE tablename SET col = SUBSTRING(col2, 1, 2)");
+	}
 }