fixes #479

JSQLParser · Feb 19, 2019 · b029bb5 · b029bb5
1 parent fa16241
commit b029bb5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -46,6 +46,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
     private Wait wait;
     private boolean mySqlSqlCalcFoundRows = false;
     private boolean sqlNoCacheFlag = false;
+    private String forXmlPath;
 
     public boolean isUseBrackets() {
         return useBrackets;
@@ -271,6 +272,14 @@ public Wait getWait() {
         return wait;
     }
 
+    public String getForXmlPath() {
+        return forXmlPath;
+    }
+
+    public void setForXmlPath(String forXmlPath) {
+        this.forXmlPath = forXmlPath;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder();
@@ -369,6 +378,9 @@ public String toString() {
                 sql.append(" WHERE ").append(where);
             }
         }
+        if (forXmlPath != null) {
+            sql.append(" FOR XML PATH(").append(forXmlPath).append(")");
+        }
         if (useBrackets) {
             sql.append(")");
         }

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -9,14 +9,13 @@
  */
 package net.sf.jsqlparser.util.deparser;
 
+import java.util.Iterator;
+import java.util.List;
 import net.sf.jsqlparser.expression.*;
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.select.*;
 import net.sf.jsqlparser.statement.values.ValuesStatement;
 
-import java.util.Iterator;
-import java.util.List;
-
 public class SelectDeParser implements SelectVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {
 
     protected StringBuilder buffer = new StringBuilder();
@@ -168,6 +167,9 @@ public void visit(PlainSelect plainSelect) {
         if (plainSelect.getOptimizeFor() != null) {
             deparseOptimizeFor(plainSelect.getOptimizeFor());
         }
+        if (plainSelect.getForXmlPath() != null) {
+            buffer.append(" FOR XML PATH(" + plainSelect.getForXmlPath() + ")");
+        }
         if (plainSelect.isUseBrackets()) {
             buffer.append(")");
         }
@@ -328,11 +330,11 @@ public void visit(SubJoin subjoin) {
     }
 
     public void deparseJoin(Join join) {
-            if (join.isSimple() && join.isOuter()) {
-               buffer.append(", OUTER ");
-            } else if (join.isSimple()) {
-               buffer.append(", ");
-            } else {
+        if (join.isSimple() && join.isOuter()) {
+            buffer.append(", OUTER ");
+        } else if (join.isSimple()) {
+            buffer.append(", ");
+        } else {
 
             if (join.isRight()) {
                 buffer.append(" RIGHT");

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -223,6 +223,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_OVER:"OVER">
 |   <K_OPTIMIZE: "OPTIMIZE" >
 |   <K_PARTITION:"PARTITION">
+|   <K_PATH:"PATH">
 |   <K_PERCENT:"PERCENT">
 |   <K_PIVOT:"PIVOT">
 |   <K_PLACING:"PLACING">
@@ -1041,7 +1042,7 @@ String RelObjectNameWithoutValue() :
       | tk=<K_INSERT> | tk=<K_INDEX> | tk=<K_PRIMARY> | tk=<K_ENABLE>
 	  | tk=<K_UNSIGNED>
       | tk=<K_TEMP> | tk=<K_TEMPORARY> | tk=<K_TYPE> | tk=<K_ISNULL> 
-	  | tk=<K_ZONE> | tk=<K_COLUMNS> | tk=<K_DESCRIBE> | tk=<K_FN>
+	  | tk=<K_ZONE> | tk=<K_COLUMNS> | tk=<K_DESCRIBE> | tk=<K_FN> | tk=<K_PATH>
 /*      | tk=<K_PLACING> | tk=<K_BOTH> | tk=<K_LEADING> | tk=<K_TRAILING> */
       )
 
@@ -1214,12 +1215,14 @@ PlainSelect PlainSelect() #PlainSelect:
     [LOOKAHEAD(<K_OFFSET>) offset = Offset() { plainSelect.setOffset(offset);    } ]
     [LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch);    } ]
 
-    [ <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }
+    [ LOOKAHEAD(2) <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }
         [ <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ]
         [ LOOKAHEAD(<K_WAIT>) wait = Wait() { plainSelect.setWait(wait); } ] ]
 
     [LOOKAHEAD(<K_OPTIMIZE>) optimize = OptimizeFor() { plainSelect.setOptimizeFor(optimize); } ]
 
+    [ <K_FOR> <K_XML> <K_PATH> "(" token = <S_CHAR_LITERAL> ")" { plainSelect.setForXmlPath(token.image); } ]
+
     {
         plainSelect.setSelectItems(selectItems);
         plainSelect.setFromItem(fromItem);

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -3407,6 +3407,11 @@ public void testSqlContainIsNullFunctionShouldBeParsed3() throws JSQLParserExcep
         assertSqlCanBeParsedAndDeparsed("SELECT name, age FROM person WHERE NOT ISNULL(home, 'earn more money')");
     }
 
+    @Test
+    public void testForXmlPath() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT '|' + person_name FROM person JOIN person_group ON person.person_id = person_group.person_id WHERE person_group.group_id = 1 FOR XML PATH('')");
+    }
+
 //    @Test
 //    public void testIntervalExpression() throws JSQLParserException {
 //        assertSqlCanBeParsedAndDeparsed("SELECT count(emails.id) FROM emails WHERE (emails.date_entered + 30 DAYS) > CURRENT_DATE");