fixes #1159

Author: wumpz

README.md

@@ -57,6 +57,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 4.1
 
+* support for parser modification within **parseExpression** and **parseCondExpression**
 ' support for table schema for foreign keys
 * support for Oracle hints on **insert, update and merge**
 * support for **merge insert where** clause

src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java

@@ -38,7 +38,8 @@ public static Statement parse(String sql) throws JSQLParserException {
     }
 
     /**
-     * Parses an sql statement while allowing via consumer to configure the used parser before.
+     * Parses an sql statement while allowing via consumer to configure the used
+     * parser before.
      *
      * For instance to activate SQLServer bracket quotation on could use:
      *
@@ -104,7 +105,15 @@ public static Expression parseExpression(String expression) throws JSQLParserExc
     }
 
     public static Expression parseExpression(String expression, boolean allowPartialParse) throws JSQLParserException {
+        return parseExpression(expression, allowPartialParse, p -> {
+        });
+    }
+
+    public static Expression parseExpression(String expression, boolean allowPartialParse, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         CCJSqlParser parser = newParser(expression);
+        if (consumer != null) {
+            consumer.accept(parser);
+        }
         try {
             Expression expr = parser.SimpleExpression();
             if (!allowPartialParse && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
@@ -119,8 +128,8 @@ public static Expression parseExpression(String expression, boolean allowPartial
     }
 
     /**
-     * Parse an conditional expression. This is the expression after a where clause.
-     * Partial parsing is enabled.
+     * Parse an conditional expression. This is the expression after a where
+     * clause. Partial parsing is enabled.
      *
      * @param condExpr
      * @return the expression parsed
@@ -131,15 +140,24 @@ public static Expression parseCondExpression(String condExpr) throws JSQLParserE
     }
 
     /**
-     * Parse an conditional expression. This is the expression after a where clause.
+     * Parse an conditional expression. This is the expression after a where
+     * clause.
      *
      * @param condExpr
      * @param allowPartialParse false: needs the whole string to be processed.
      * @return the expression parsed
      * @see #parseCondExpression(String)
      */
     public static Expression parseCondExpression(String condExpr, boolean allowPartialParse) throws JSQLParserException {
+        return parseCondExpression(condExpr, allowPartialParse, p -> {
+        });
+    }
+
+    public static Expression parseCondExpression(String condExpr, boolean allowPartialParse, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         CCJSqlParser parser = newParser(condExpr);
+        if (consumer != null) {
+            consumer.accept(parser);
+        }
         try {
             Expression expr = parser.Expression();
             if (!allowPartialParse && parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {

src/test/java/net/sf/jsqlparser/parser/CCJSqlParserUtilTest.java

@@ -216,4 +216,18 @@ public void testParseExpressionIssue982() throws Exception {
         Expression result = CCJSqlParserUtil.parseExpression("tab.col");
         assertEquals("tab.col", result.toString());
     }
+    
+    @Test
+    public void testParseExpressionWithBracketsIssue1159() throws Exception {
+        Expression result = CCJSqlParserUtil.parseExpression("[travel_data].[travel_id]", false, 
+                parser -> parser.withSquareBracketQuotation(true));
+        assertEquals("[travel_data].[travel_id]", result.toString());
+    }
+    
+    @Test
+    public void testParseExpressionWithBracketsIssue1159_2() throws Exception {
+        Expression result = CCJSqlParserUtil.parseCondExpression("[travel_data].[travel_id]", false, 
+                parser -> parser.withSquareBracketQuotation(true));
+        assertEquals("[travel_data].[travel_id]", result.toString());
+    }
 }