fixes #468

JSQLParser · Jun 28, 2017 · 6cb459d · 6cb459d
1 parent c23558f
commit 6cb459d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -300,7 +300,7 @@ TOKEN : /* Operators */
 
 TOKEN : /* Date/Time with time zones */
 {
-    <DT_ZONE: <K_DATETIMELITERAL> <WHITESPACE> (<K_WITH> | <K_WITHOUT>) <WHITESPACE> "TIME" <WHITESPACE> <K_ZONE>>
+    <DT_ZONE: <K_DATETIMELITERAL> (<WHITESPACE>)* ("(" <S_LONG> ")")? (<WHITESPACE>)* (<K_WITH> | <K_WITHOUT>) (<WHITESPACE>)+ "TIME" (<WHITESPACE>)+ <K_ZONE>>
 }
 
 TOKEN : /* Numeric Constants */

diff --git a/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java b/src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java
@@ -255,6 +255,15 @@ public void testCreateUnitonIssue402() throws JSQLParserException {
     public void testCreateUnitonIssue402_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE temp.abc AS (SELECT sku FROM temp.a UNION SELECT sku FROM temp.b)");
     }
+
+    public void testTimestampWithTimezone() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE country_region (" +
+                "regionid BIGINT NOT NULL CONSTRAINT pk_auth_region PRIMARY KEY, " +
+                "region_name VARCHAR (100) NOT NULL, " +
+                "creation_date TIMESTAMP (0) WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0) NOT NULL, " +
+                "last_change_date TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0), " +
+                "CONSTRAINT region_name_unique UNIQUE (region_name))");
+    }
 
     public void testRUBiSCreateList() throws Exception {
         BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.