Merge pull request #816 from yakolee/master

1.0.14

pom.xml

@@ -11,7 +11,7 @@
   
 	<groupId>com.alibaba</groupId>
 	<artifactId>druid</artifactId>
-	<version>1.0.13</version>
+	<version>1.0.14</version>
 
 	<packaging>jar</packaging>
 	<name>druid</name>

src/main/java/com/alibaba/druid/VERSION.java

@@ -19,7 +19,7 @@ public final class VERSION {
 
     public final static int MajorVersion    = 1;
     public final static int MinorVersion    = 0;
-    public final static int RevisionVersion = 13;
+    public final static int RevisionVersion = 14;
 
     public static String getVersionNumber() {
         return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;

src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java

@@ -458,6 +458,11 @@ public class SQLExprParser extends SQLParser {
                         sqlExpr = new SQLNumberExpr(lexer.decimalValue());
                         lexer.nextToken();
                         break;
+                    case IDENTIFIER: // 当+号后面为字段的情况
+                        sqlExpr = new SQLIdentifierExpr(lexer.stringVal());
+                        sqlExpr = new SQLUnaryExpr(SQLUnaryOperator.Plus, sqlExpr);
+                        lexer.nextToken();
+                        break;
                     case LPAREN:
                         lexer.nextToken();
                         sqlExpr = expr();

src/main/resources/support/http/resources/js/doT.js

@@ -6,7 +6,7 @@
 	"use strict";
 
 	var doT = {
-		version: '1.0.9',
+		version: '1.0.14',
 		templateSettings: {
 			evaluate:    /\{\{([\s\S]+?\}?)\}\}/g,
 			interpolate: /\{\{=([\s\S]+?)\}\}/g,

src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java

@@ -621,6 +621,29 @@ public class DateAndTimeFunctionsTest extends TestCase {
 
         Assert.assertEquals("SELECT YEARWEEK('1987-01-01');", text);
     }
+    
+    
+    public void test_54() throws Exception {
+        String sql = "SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY) from t";
+
+        SQLStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+
+        String text = output(stmtList);
+
+        Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY)\nFROM t;", text);
+    }
+    
+    public void test_55() throws Exception {
+        String sql = "SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL -t.c1 DAY) from t";
+
+        SQLStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+
+        String text = output(stmtList);
+
+        Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL -t.c1 DAY)\nFROM t;", text);
+    }
 
     private String output(List<SQLStatement> stmtList) {
         StringBuilder out = new StringBuilder();