Merge origin/master

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/TimestampValue.java

@@ -19,7 +19,8 @@
 public class TimestampValue extends ASTNodeAccessImpl implements Expression {
 
     private Timestamp value;
-    private char quotation = '\'';
+    private String rawValue;
+    private static final char QUOTATION = '\'';
 
     public TimestampValue() {
         // empty constructor
@@ -29,11 +30,7 @@ public TimestampValue(String value) {
         if (value == null) {
             throw new java.lang.IllegalArgumentException("null string");
         } else {
-            if (value.charAt(0) == quotation) {
-                this.value = Timestamp.valueOf(value.substring(1, value.length() - 1));
-            } else {
-                this.value = Timestamp.valueOf(value.substring(0, value.length()));
-            }
+            setRawValue(value);
         }
     }
 
@@ -50,6 +47,19 @@ public void setValue(Timestamp d) {
         value = d;
     }
 
+    public String getRawValue() {
+        return rawValue;
+    }
+
+    public void setRawValue(String rawValue) {
+        this.rawValue = rawValue;
+        if (rawValue.charAt(0) == QUOTATION) {
+            this.value = Timestamp.valueOf(rawValue.substring(1, rawValue.length() - 1));
+        } else {
+            this.value = Timestamp.valueOf(rawValue.substring(0, rawValue.length()));
+        }
+    }
+
     @Override
     public String toString() {
         return "{ts '" + value + "'}";

src/test/java/net/sf/jsqlparser/expression/TimestampValueTest.java

@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.expression;
 
+import static org.junit.Assert.assertEquals;
 import net.sf.jsqlparser.JSQLParserException;
 import org.junit.Test;
 
@@ -25,6 +26,7 @@ public void testTimestampValue_issue525() throws JSQLParserException {
         String currentDate = dateFormat.format(new Date());
         TimestampValue tv = new TimestampValue(currentDate);
         System.out.println(tv.toString());
+        assertEquals(currentDate, tv.getRawValue());
     }
 
     @Test
@@ -33,5 +35,6 @@ public void testTimestampValueWithQuotation_issue525() throws JSQLParserExceptio
         String currentDate = dateFormat.format(new Date());
         TimestampValue tv = new TimestampValue("'" + currentDate + "'");
         System.out.println(tv.toString());
+        assertEquals("'" + currentDate + "'", tv.getRawValue());
     }
 }