Distinguish between INT and INTEGER types (apache#525)

frolovdev · alamb · web-flow · commit f29ce10a1a14 · 2022-06-21T09:32:10.000-04:00
* support integer

* fmt

* Update src/ast/data_type.rs

Co-authored-by: Andrew Lamb &lt;andrew@nerdnetworks.org&gt;

Co-authored-by: Andrew Lamb &lt;andrew@nerdnetworks.org&gt;
diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
@@ -55,8 +55,12 @@ pub enum DataType {
     UnsignedSmallInt(Option<u64>),
     /// Integer with optional display width e.g. INT or INT(11)
     Int(Option<u64>),
+    /// Integer with optional display width e.g. INTEGER or INTEGER(11)
+    Integer(Option<u64>),
     /// Unsigned integer with optional display width e.g. INT UNSIGNED or INT(11) UNSIGNED
     UnsignedInt(Option<u64>),
+    /// Unsigned integer with optional display width e.g. INTGER UNSIGNED or INTEGER(11) UNSIGNED
+    UnsignedInteger(Option<u64>),
     /// Big integer with optional display width e.g. BIGINT or BIGINT(20)
     BigInt(Option<u64>),
     /// Unsigned big integer with optional display width e.g. BIGINT UNSIGNED or BIGINT(20) UNSIGNED
@@ -134,6 +138,12 @@ impl fmt::Display for DataType {
             DataType::UnsignedInt(zerofill) => {
                 format_type_with_optional_length(f, "INT", zerofill, true)
             }
+            DataType::Integer(zerofill) => {
+                format_type_with_optional_length(f, "INTEGER", zerofill, false)
+            }
+            DataType::UnsignedInteger(zerofill) => {
+                format_type_with_optional_length(f, "INTEGER", zerofill, true)
+            }
             DataType::BigInt(zerofill) => {
                 format_type_with_optional_length(f, "BIGINT", zerofill, false)
             }
diff --git a/src/parser.rs b/src/parser.rs
@@ -2859,14 +2859,22 @@ impl<'a> Parser<'a> {
                         Ok(DataType::SmallInt(optional_precision?))
                     }
                 }
-                Keyword::INT | Keyword::INTEGER => {
+                Keyword::INT => {
                     let optional_precision = self.parse_optional_precision();
                     if self.parse_keyword(Keyword::UNSIGNED) {
                         Ok(DataType::UnsignedInt(optional_precision?))
                     } else {
                         Ok(DataType::Int(optional_precision?))
                     }
                 }
+                Keyword::INTEGER => {
+                    let optional_precision = self.parse_optional_precision();
+                    if self.parse_keyword(Keyword::UNSIGNED) {
+                        Ok(DataType::UnsignedInteger(optional_precision?))
+                    } else {
+                        Ok(DataType::Integer(optional_precision?))
+                    }
+                }
                 Keyword::BIGINT => {
                     let optional_precision = self.parse_optional_precision();
                     if self.parse_keyword(Keyword::UNSIGNED) {
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -35,7 +35,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,
-            active integer NOT NULL
+            active int NOT NULL
     ) WITH (fillfactor = 20, user_catalog_table = true, autovacuum_vacuum_threshold = 100)";
     match pg_and_generic().one_statement_parses_to(sql, "") {
         Statement::CreateTable {
@@ -55,7 +55,7 @@ fn parse_create_table_with_defaults() {
                 vec![
                     ColumnDef {
                         name: "customer_id".into(),
-                        data_type: DataType::Int(None),
+                        data_type: DataType::Integer(None),
                         collation: None,
                         options: vec![ColumnOptionDef {
                             name: None,
@@ -201,10 +201,10 @@ fn parse_create_table_from_pg_dump() {
             create_date1 date DEFAULT 'now'::TEXT::date NOT NULL,
             last_update timestamp without time zone DEFAULT now(),
             release_year public.year,
-            active integer
+            active int
         )";
     pg().one_statement_parses_to(sql, "CREATE TABLE public.customer (\
-            customer_id INT DEFAULT nextval(CAST('public.customer_customer_id_seq' AS REGCLASS)) NOT NULL, \
+            customer_id INTEGER DEFAULT nextval(CAST('public.customer_customer_id_seq' AS REGCLASS)) NOT NULL, \
             store_id SMALLINT NOT NULL, \
             first_name CHARACTER VARYING(45) NOT NULL, \
             last_name CHARACTER VARYING(45) NOT NULL, \

Original file line number	Diff line number	Diff line change
`@@ -2859,14 +2859,22 @@ impl<'a> Parser<'a> {`
`2859`	`2859`	`Ok(DataType::SmallInt(optional_precision?))`
`2860`	`2860`	`}`
`2861`	`2861`	`}`
`2862`		`- Keyword::INT \| Keyword::INTEGER => {`
	`2862`	`+ Keyword::INT => {`
`2863`	`2863`	`let optional_precision = self.parse_optional_precision();`
`2864`	`2864`	`if self.parse_keyword(Keyword::UNSIGNED) {`
`2865`	`2865`	`Ok(DataType::UnsignedInt(optional_precision?))`
`2866`	`2866`	`} else {`
`2867`	`2867`	`Ok(DataType::Int(optional_precision?))`
`2868`	`2868`	`}`
`2869`	`2869`	`}`
	`2870`	`+ Keyword::INTEGER => {`
	`2871`	`+ let optional_precision = self.parse_optional_precision();`
	`2872`	`+ if self.parse_keyword(Keyword::UNSIGNED) {`
	`2873`	`+ Ok(DataType::UnsignedInteger(optional_precision?))`
	`2874`	`+ } else {`
	`2875`	`+ Ok(DataType::Integer(optional_precision?))`
	`2876`	`+ }`
	`2877`	`+ }`
`2870`	`2878`	`Keyword::BIGINT => {`
`2871`	`2879`	`let optional_precision = self.parse_optional_precision();`
`2872`	`2880`	`if self.parse_keyword(Keyword::UNSIGNED) {`