Improve the create statement parser that uses create statements from pg database dump

ivanceras · ivanceras · commit 20079959389f · 2018-09-24T03:34:40.000+08:00
Added PostgreSQL style casting
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,3 +18,4 @@ name = "sqlparser"
 path = "src/lib.rs"
 
 [dependencies]
+log = "0.4.5"
diff --git a/src/dialect.rs b/src/dialect.rs
@@ -432,6 +432,12 @@ impl Dialect for GenericSqlDialect {
             "DATE",
             "TIME",
             "TIMESTAMP",
+            "VALUES",
+            "DEFAULT",
+            "ZONE",
+            "REGCLASS",
+            "TEXT",
+            "BYTEA",
         ];
     }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -35,6 +35,9 @@
 //! println!("AST: {:?}", ast);
 //! ```
 
+#[macro_use]
+extern crate log;
+
 pub mod dialect;
 pub mod sqlast;
 pub mod sqlparser;
diff --git a/src/sqlast.rs b/src/sqlast.rs
@@ -135,15 +135,16 @@ pub struct SQLColumnDef {
     pub name: String,
     pub data_type: SQLType,
     pub allow_null: bool,
+    pub default: Option<Box<ASTNode>>,
 }
 
 /// SQL datatypes for literals in SQL statements
 #[derive(Debug, Clone, PartialEq)]
 pub enum SQLType {
     /// Fixed-length character type e.g. CHAR(10)
-    Char(usize),
+    Char(Option<usize>),
     /// Variable-length character type e.g. VARCHAR(10)
-    Varchar(usize),
+    Varchar(Option<usize>),
     /// Large character object e.g. CLOB(1000)
     Clob(usize),
     /// Fixed-length binary type e.g. BINARY(10)
@@ -174,6 +175,16 @@ pub enum SQLType {
     Time,
     /// Timestamp
     Timestamp,
+    /// Regclass used in postgresql serial
+    Regclass,
+    /// Text
+    Text,
+    /// Bytea
+    Bytea,
+    /// Custom type such as enums
+    Custom(String),
+    /// Arrays
+    Array(Box<SQLType>),
 }
 
 /// SQL Operator
diff --git a/src/sqlparser.rs b/src/sqlparser.rs
diff --git a/src/sqltokenizer.rs b/src/sqltokenizer.rs

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,4 @@ name = "sqlparser"`
`18`	`18`	`path = "src/lib.rs"`
`19`	`19`
`20`	`20`	`[dependencies]`
	`21`	`+log = "0.4.5"`