Retain time zone information in time types

Author: benesch

src/ast/data_type.rs

@@ -48,10 +48,14 @@ pub enum DataType {
     Boolean,
     /// Date
     Date,
-    /// Time
+    /// Time without time zone
     Time,
-    /// Timestamp
+    /// Time with time zone
+    TimeTz,
+    /// Timestamp without time zone
     Timestamp,
+    /// Timestamp with time zone
+    TimestampTz,
     /// Interval
     Interval,
     /// Regclass used in postgresql serial
@@ -94,7 +98,9 @@ impl fmt::Display for DataType {
             DataType::Boolean => write!(f, "boolean"),
             DataType::Date => write!(f, "date"),
             DataType::Time => write!(f, "time"),
+            DataType::TimeTz => write!(f, "time with time zone"),
             DataType::Timestamp => write!(f, "timestamp"),
+            DataType::TimestampTz => write!(f, "timestamp with time zone"),
             DataType::Interval => write!(f, "interval"),
             DataType::Regclass => write!(f, "regclass"),
             DataType::Text => write!(f, "text"),

src/parser.rs

@@ -1541,15 +1541,19 @@ impl Parser {
                 "UUID" => Ok(DataType::Uuid),
                 "DATE" => Ok(DataType::Date),
                 "TIMESTAMP" => {
-                    // TBD: we throw away "with/without timezone" information
-                    if self.parse_keyword("WITH") || self.parse_keyword("WITHOUT") {
+                    if self.parse_keyword("WITH") {
+                        self.expect_keywords(&["TIME", "ZONE"])?;
+                        return Ok(DataType::TimestampTz)
+                    } else if self.parse_keyword("WITHOUT") {
                         self.expect_keywords(&["TIME", "ZONE"])?;
                     }
                     Ok(DataType::Timestamp)
                 }
                 "TIME" => {
-                    // TBD: we throw away "with/without timezone" information
-                    if self.parse_keyword("WITH") || self.parse_keyword("WITHOUT") {
+                    if self.parse_keyword("WITH") {
+                        self.expect_keywords(&["TIME", "ZONE"])?;
+                        return Ok(DataType::TimeTz)
+                    } else if self.parse_keyword("WITHOUT") {
                         self.expect_keywords(&["TIME", "ZONE"])?;
                     }
                     Ok(DataType::Time)

tests/sqlparser_postgres.rs

@@ -31,6 +31,7 @@ fn parse_create_table_with_defaults() {
             activebool boolean DEFAULT true NOT NULL,
             create_date date DEFAULT now()::text NOT NULL,
             last_update timestamp without time zone DEFAULT now() NOT NULL,
+            last_update_tz timestamp with time zone,
             active integer NOT NULL
     ) WITH (fillfactor = 20, user_catalog_table = true, autovacuum_vacuum_threshold = 100)";
     match pg_and_generic().one_statement_parses_to(sql, "") {
@@ -147,6 +148,12 @@ fn parse_create_table_with_defaults() {
                             }
                         ],
                     },
+                    ColumnDef {
+                        name: "last_update_tz".into(),
+                        data_type: DataType::TimestampTz,
+                        collation: None,
+                        options: vec![],
+                    },
                     ColumnDef {
                         name: "active".into(),
                         data_type: DataType::Int,