Merge branch 'master' into teradata_sel

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java

@@ -31,6 +31,7 @@
 public class Truncate implements Statement {
 
     private Table table;
+    boolean cascade;  // to support TRUNCATE TABLE ... CASCADE
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -45,8 +46,19 @@ public void setTable(Table table) {
         this.table = table;
     }
 
+    public boolean getCascade(){
+        return cascade;
+    }
+
+    public void setCascade(boolean c){
+        cascade=c;
+    }
+
     @Override
     public String toString() {
+        if(cascade){
+            return "TRUNCATE TABLE " + table+" CASCADE";
+        }
         return "TRUNCATE TABLE " + table;
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java

@@ -144,6 +144,11 @@ public void visit(Select select) {
 
     @Override
     public void visit(Truncate truncate) {
+        buffer.append("TRUNCATE TABLE ");
+        buffer.append(truncate.getTable());
+        if(truncate.getCascade()){
+            buffer.append(" CASCADE");
+        }
     }
 
     @Override

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -979,6 +979,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_ISNULL> 
+	  | tk=<K_ZONE>
       )
 
     { return tk.image; }
@@ -3448,7 +3449,7 @@ Truncate Truncate():
 }
 {
     <K_TRUNCATE> <K_TABLE>
-    table=Table() { truncate.setTable(table); }
+	table=Table() { truncate.setTable(table); truncate.setCascade(false); } [ <K_CASCADE> {truncate.setCascade(true);} ]
     {
         return truncate;
     }

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

@@ -1025,6 +1025,13 @@ public void testFunctions() throws JSQLParserException {
         assertTrue(fun.isAllColumns());
         assertStatementCanBeDeparsedAs(select, statement);
     }
+    
+    @Test
+    public void testEscapedFunctionsIssue647() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT {fn test(0)} AS COL");
+        //assertSqlCanBeParsedAndDeparsed("SELECT {fn current_timestamp(0)} AS COL");
+        assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL");
+    }
 
     @Test
     public void testWhere() throws JSQLParserException {
@@ -3231,5 +3238,9 @@ public void testSelContraction() throws JSQLParserException {
         Select select = (Select) parserManager.parse(new StringReader(statementSrc));
         assertStatementCanBeDeparsedAs(select, statementTgt);
     }
-
+  
+    @Test
+    public void testMultiPartNamesIssue643() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT id, bid, pid, devnum, pointdesc, sysid, zone, sort FROM fault ORDER BY id DESC LIMIT ?, ?");
+    }
 }

src/test/java/net/sf/jsqlparser/statement/truncate/TruncateTest.java

@@ -2,6 +2,9 @@
 
 import java.io.StringReader;
 
+import static net.sf.jsqlparser.test.TestUtils.*;
+import net.sf.jsqlparser.*;
+
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
@@ -23,5 +26,20 @@ public void testTruncate() throws Exception {
         truncate = (Truncate) parserManager.parse(new StringReader(statement));
         assertEquals("mytab", truncate.getTable().getName());
         assertEquals(toStringStatement.toUpperCase(), truncate.toString().toUpperCase());
+
+        statement = "TRUNCATE TABLE mytab CASCADE";
+        truncate = (Truncate) parserManager.parse(new StringReader(statement));
+        assertEquals(statement, truncate.toString());
+    }
+
+    @Test
+    public void testTruncateDeparse() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("TRUNCATE TABLE foo");
     }
+
+    @Test
+    public void testTruncateCascadeDeparse() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("TRUNCATE TABLE foo CASCADE");
+    }
+
 }