Merge origin/master

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

Author: wumpz

README.md

@@ -2,7 +2,9 @@
 
 [![Build Status](https://travis-ci.org/JSQLParser/JSqlParser.svg?branch=master)](https://travis-ci.org/JSQLParser/JSqlParser)   [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
 
-[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=wumpz&url=http%3A%2F%2Fgithub.com%2FJSQLParser%2FJSqlParser)  [![PayPal donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")  
+[![PayPal donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")  
+
+[![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Look here for more information and examples: https://github.com/JSQLParser/JSqlParser/wiki.
 
@@ -40,6 +42,9 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 0.9.6
 
+* allowed negative interval expressions like **INTERVAL -420 MINUTES**.
+* support for **ALTER VIEW** statements
+
 ## Extensions of JSqlParser releases
 
 * [Release Notes](https://github.com/JSQLParser/JSqlParser/releases)

src/main/java/net/sf/jsqlparser/statement/merge/Merge.java

@@ -112,13 +112,13 @@ public String toString() {
         StringBuilder b = new StringBuilder();
         b.append("MERGE INTO ");
         b.append(table);
-        b.append(" USING (");
+        b.append(" USING ");
         if (usingTable != null) {
             b.append(usingTable.toString());
         } else if (usingSelect != null) {
-            b.append(usingSelect.toString());
+            b.append("(").append(usingSelect.toString()).append(")");
         }
-        b.append(")");
+        
         if (usingAlias != null) {
             b.append(usingAlias.toString());
         }

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

@@ -38,7 +38,7 @@
  */
 public class ExpressionDeParser implements ExpressionVisitor, ItemsListVisitor {
 
-    private static final String NOT = " NOT ";
+    private static final String NOT = "NOT ";
 	private StringBuilder buffer;
     private SelectVisitor selectVisitor;
     private boolean useBracketsInExprList = true;

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

@@ -585,10 +585,10 @@ Statement Merge() : {
 }
 {
     <K_MERGE> <K_INTO> table=TableWithAlias() { merge.setTable(table); }
-    <K_USING> "(" 
+    <K_USING> 
         ( table=Table() { merge.setUsingTable(table); } 
-            | select=SubSelect() { merge.setUsingSelect(select); } )
-    ")" [ alias = Alias() { merge.setUsingAlias(alias); } ] <K_ON> 
+            | "(" select=SubSelect() { merge.setUsingSelect(select); } ")" )
+     [ alias = Alias() { merge.setUsingAlias(alias); } ] <K_ON> 
        "(" condition = Condition() { merge.setOnCondition(condition); } ")"
 
     [ LOOKAHEAD(2) update = MergeUpdateClause() { merge.setMergeUpdate(update); } ]
@@ -670,7 +670,7 @@ String RelObjectName() :
       | tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_VALUE> | tk=<K_XML>
       | tk=<K_COLUMN> | tk=<K_REPLACE> | tk=<K_TRUNCATE> | tk=<K_KEY> | tk=<K_ANY>
       | tk=<K_OPEN> | tk=<K_OVER> | tk=<K_VALUES> | tk=<K_PERCENT> | tk=<K_PRIOR>
-	  | tk=<K_SEPARATOR> | tk=<K_NO> | tk=<K_ACTION> | tk=<K_CASCADE>
+	  | tk=<K_SEPARATOR> | tk=<K_NO> | tk=<K_ACTION> | tk=<K_CASCADE> | tk=<K_END>
       )
 
     { return tk.image; }
@@ -1580,12 +1580,14 @@ Expression AndExpression() :
 Expression Condition():
 {
 	Expression result;
+    Token token;
 }
 {
 	(LOOKAHEAD(SQLCondition()) result=SQLCondition()
 	| LOOKAHEAD(RegularCondition()) result=RegularCondition()
 	| LOOKAHEAD(Function()) result=Function()
     | result=Column()
+	| LOOKAHEAD({ "0".equals(getToken(1).image) || "1".equals(getToken(1).image) }) token=<S_LONG> { result = new LongValue(token.image); }
 	)
 
 	{ return result; }
@@ -2122,10 +2124,11 @@ JsonExpression JsonExpression() : {
 IntervalExpression IntervalExpression() : {
 	IntervalExpression interval = new IntervalExpression();
 	Token token;
+	boolean signed = false;
 }
 {
-	<K_INTERVAL> (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL>) 
-    { interval.setParameter(token.image); }
+	<K_INTERVAL> ["-" {signed=true;}] (token=<S_LONG> | token=<S_DOUBLE> | token=<S_CHAR_LITERAL>) 
+    { interval.setParameter((signed?"-":"") + token.image); }
     [ LOOKAHEAD(2) token = <S_IDENTIFIER> { interval.setIntervalType(token.image); } ]
 	{
 		return interval;

src/test/java/net/sf/jsqlparser/test/merge/MergeTest.java

@@ -50,4 +50,16 @@ public void testOracleMergeIntoStatement() throws JSQLParserException {
 
         assertSqlCanBeParsedAndDeparsed(sql, true);
     }
+    
+    @Test
+    public void testMergeIssue232() throws JSQLParserException {
+        String sql = "MERGE INTO xyz using dual " +
+                        "ON ( custom_id = ? ) " +
+                        "WHEN matched THEN " +
+                        "UPDATE SET abc = sysdate " +
+                        "WHEN NOT matched THEN " +
+                        "INSERT (custom_id) VALUES (?)";
+                        
+        assertSqlCanBeParsedAndDeparsed(sql, true);
+    }
 }

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

@@ -18,7 +18,6 @@
  */
 package net.sf.jsqlparser.test.select;
 
-import junit.framework.TestCase;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserTreeConstants;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -30,17 +29,17 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SelectItem;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
 
 /**
  *
  * @author toben
  */
-public class SelectASTTest extends TestCase {
-
-    public SelectASTTest(String name) {
-        super(name);
-    }
+public class SelectASTTest {
 
+    @Test
     public void testSelectASTColumn() throws JSQLParserException {
         String sql = "SELECT  a,  b FROM  mytable  order by   b,  c";
         StringBuilder b = new StringBuilder(sql);
@@ -63,9 +62,9 @@ public void testSelectASTColumn() throws JSQLParserException {
         assertEquals("SELECT  *,  * FROM  mytable  order by   #,  #", b.toString());
     }
 
+    @Test
     public void testSelectASTNode() throws JSQLParserException {
         String sql = "SELECT  a,  b FROM  mytable  order by   b,  c";
-        StringBuilder b = new StringBuilder(sql);
         SimpleNode node = (SimpleNode) CCJSqlParserUtil.parseAST(sql);
         node.dump("*");
         assertEquals(CCJSqlParserTreeConstants.JJTSTATEMENT, node.getId());