From 915ac322277de98987bfe9ad8480c87ea7dff149 Mon Sep 17 00:00:00 2001 From: Jovansonlee Cesar Date: Tue, 16 Jun 2020 23:04:15 +0300 Subject: [PATCH 1/5] Implement DROP COLUMN in alter table in addition to ADD COLUMN --- src/ast/ddl.rs | 17 +++++++++++++++++ src/parser.rs | 23 ++++++++++++++++++++++- tests/sqlparser_common.rs | 25 +++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index c1e66373b9..1cbd4f8c59 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -27,6 +27,12 @@ pub enum AlterTableOperation { AddColumn { column_def: ColumnDef }, /// TODO: implement `DROP CONSTRAINT ` DropConstraint { name: Ident }, + /// `DROP COLUMN [ IF EXISTS ] [ CASCADE ]` + DropColumn { + column: Ident, + if_exists: bool, + cascade: bool, + }, /// `RENAME [ COLUMN ] TO ` RenameColumn { old_column_name: Ident, @@ -44,6 +50,17 @@ impl fmt::Display for AlterTableOperation { write!(f, "ADD COLUMN {}", column_def.to_string()) } AlterTableOperation::DropConstraint { name } => write!(f, "DROP CONSTRAINT {}", name), + AlterTableOperation::DropColumn { + column, + if_exists, + cascade, + } => write!( + f, + "DROP COLUMN {}{} {}", + if *if_exists { "IF EXISTS " } else { " " }, + column, + if *cascade { "CASCADE" } else { "" } + ), AlterTableOperation::RenameColumn { old_column_name, new_column_name, diff --git a/src/parser.rs b/src/parser.rs index fb750afa00..cd4a98b94a 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1340,8 +1340,29 @@ impl Parser { new_column_name, } } + } else if self.parse_keyword(Keyword::DROP) { + if self.parse_keyword(Keyword::COLUMN) { + let if_exists = if self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]) { + true + } else { + false + }; + let column = self.parse_identifier()?; + let cascade = if self.parse_keyword(Keyword::CASCADE) { + true + } else { + false + }; + AlterTableOperation::DropColumn { + column, + if_exists, + cascade, + } + } else { + return self.expected("a column in ALTER TABLE .. DROP", self.peek_token()); + } } else { - return self.expected("ADD or RENAME after ALTER TABLE", self.peek_token()); + return self.expected("ADD, RENAME, or DROP after ALTER TABLE", self.peek_token()); }; Ok(Statement::AlterTable { name: table_name, diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index 15050c6fbe..a2687cd26b 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -1388,6 +1388,31 @@ fn parse_alter_table_constraints() { } } +#[test] +fn parse_alter_table_drop_column() { + check_one("DROP COLUMN IF EXISTS is_active CASCADE"); + + fn check_one(constraint_text: &str) { + match verified_stmt(&format!("ALTER TABLE tab {}", constraint_text)) { + Statement::AlterTable { + name, + operation: + AlterTableOperation::DropColumn { + column, + if_exists, + cascade, + }, + } => { + assert_eq!("tab", name.to_string()); + assert_eq!("is_active", column.to_string()); + assert_eq!(true, if_exists); + assert_eq!(true, cascade); + } + _ => unreachable!(), + } + } +} + #[test] fn parse_bad_constraint() { let res = parse_sql_statements("ALTER TABLE tab ADD"); From 9a829a73e9a218173095e37bf3144edef9cf5460 Mon Sep 17 00:00:00 2001 From: Nickolay Ponomarev Date: Tue, 16 Jun 2020 23:09:07 +0300 Subject: [PATCH 2/5] Fix clippy lints --- src/parser.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/parser.rs b/src/parser.rs index cd4a98b94a..72e69d1fad 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1342,17 +1342,9 @@ impl Parser { } } else if self.parse_keyword(Keyword::DROP) { if self.parse_keyword(Keyword::COLUMN) { - let if_exists = if self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]) { - true - } else { - false - }; + let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); let column = self.parse_identifier()?; - let cascade = if self.parse_keyword(Keyword::CASCADE) { - true - } else { - false - }; + let cascade = self.parse_keyword(Keyword::CASCADE); AlterTableOperation::DropColumn { column, if_exists, From f3411b28db42474800b3ba1d04ecbc810c2c4043 Mon Sep 17 00:00:00 2001 From: Nickolay Ponomarev Date: Tue, 16 Jun 2020 23:10:14 +0300 Subject: [PATCH 3/5] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06b0220cd0..d391940b03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ Check https://github.com/andygrove/sqlparser-rs/commits/master for undocumented - Support bitwise AND (`&`), OR (`|`), XOR (`^`) (#181) - thanks @Dandandan! - Add serde support to AST structs and enums (#196) - thanks @panarch! - Support `ALTER TABLE ADD COLUMN`, `RENAME COLUMN`, and `RENAME TO` (#203) - thanks @mashuai! +- Support `ALTER TABLE DROP COLUMN` (#148) - thanks @ivanceras! ### Fixed - Report an error for unterminated string literals (#165) From 01136f0719be2d2005f81be7763c8228e86cbad8 Mon Sep 17 00:00:00 2001 From: Nickolay Ponomarev Date: Tue, 16 Jun 2020 23:13:48 +0300 Subject: [PATCH 4/5] Change `column` member to `column_name`, which is more in line with other names --- src/ast/ddl.rs | 6 +++--- src/parser.rs | 4 ++-- tests/sqlparser_common.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index 1cbd4f8c59..b823b146ac 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -29,7 +29,7 @@ pub enum AlterTableOperation { DropConstraint { name: Ident }, /// `DROP COLUMN [ IF EXISTS ] [ CASCADE ]` DropColumn { - column: Ident, + column_name: Ident, if_exists: bool, cascade: bool, }, @@ -51,14 +51,14 @@ impl fmt::Display for AlterTableOperation { } AlterTableOperation::DropConstraint { name } => write!(f, "DROP CONSTRAINT {}", name), AlterTableOperation::DropColumn { - column, + column_name, if_exists, cascade, } => write!( f, "DROP COLUMN {}{} {}", if *if_exists { "IF EXISTS " } else { " " }, - column, + column_name, if *cascade { "CASCADE" } else { "" } ), AlterTableOperation::RenameColumn { diff --git a/src/parser.rs b/src/parser.rs index 72e69d1fad..f8e7e94e89 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1343,10 +1343,10 @@ impl Parser { } else if self.parse_keyword(Keyword::DROP) { if self.parse_keyword(Keyword::COLUMN) { let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); - let column = self.parse_identifier()?; + let column_name = self.parse_identifier()?; let cascade = self.parse_keyword(Keyword::CASCADE); AlterTableOperation::DropColumn { - column, + column_name, if_exists, cascade, } diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index a2687cd26b..95440f50d7 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -1398,13 +1398,13 @@ fn parse_alter_table_drop_column() { name, operation: AlterTableOperation::DropColumn { - column, + column_name, if_exists, cascade, }, } => { assert_eq!("tab", name.to_string()); - assert_eq!("is_active", column.to_string()); + assert_eq!("is_active", column_name.to_string()); assert_eq!(true, if_exists); assert_eq!(true, cascade); } From 0a6e8f037faa5be09c6ec3dedf6f20d7f611aa8a Mon Sep 17 00:00:00 2001 From: Nickolay Ponomarev Date: Tue, 16 Jun 2020 23:33:41 +0300 Subject: [PATCH 5/5] Make COLUMN optional and fix whitespace handling in fmt::Display implementation --- src/ast/ddl.rs | 8 ++++---- src/parser.rs | 19 ++++++++----------- tests/sqlparser_common.rs | 8 ++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index b823b146ac..f46364251e 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -27,7 +27,7 @@ pub enum AlterTableOperation { AddColumn { column_def: ColumnDef }, /// TODO: implement `DROP CONSTRAINT ` DropConstraint { name: Ident }, - /// `DROP COLUMN [ IF EXISTS ] [ CASCADE ]` + /// `DROP [ COLUMN ] [ IF EXISTS ] [ CASCADE ]` DropColumn { column_name: Ident, if_exists: bool, @@ -56,10 +56,10 @@ impl fmt::Display for AlterTableOperation { cascade, } => write!( f, - "DROP COLUMN {}{} {}", - if *if_exists { "IF EXISTS " } else { " " }, + "DROP COLUMN {}{}{}", + if *if_exists { "IF EXISTS " } else { "" }, column_name, - if *cascade { "CASCADE" } else { "" } + if *cascade { " CASCADE" } else { "" } ), AlterTableOperation::RenameColumn { old_column_name, diff --git a/src/parser.rs b/src/parser.rs index f8e7e94e89..543c79a6e5 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1341,17 +1341,14 @@ impl Parser { } } } else if self.parse_keyword(Keyword::DROP) { - if self.parse_keyword(Keyword::COLUMN) { - let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); - let column_name = self.parse_identifier()?; - let cascade = self.parse_keyword(Keyword::CASCADE); - AlterTableOperation::DropColumn { - column_name, - if_exists, - cascade, - } - } else { - return self.expected("a column in ALTER TABLE .. DROP", self.peek_token()); + let _ = self.parse_keyword(Keyword::COLUMN); + let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]); + let column_name = self.parse_identifier()?; + let cascade = self.parse_keyword(Keyword::CASCADE); + AlterTableOperation::DropColumn { + column_name, + if_exists, + cascade, } } else { return self.expected("ADD, RENAME, or DROP after ALTER TABLE", self.peek_token()); diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index 95440f50d7..abfa33fdff 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -1391,6 +1391,14 @@ fn parse_alter_table_constraints() { #[test] fn parse_alter_table_drop_column() { check_one("DROP COLUMN IF EXISTS is_active CASCADE"); + one_statement_parses_to( + "ALTER TABLE tab DROP IF EXISTS is_active CASCADE", + "ALTER TABLE tab DROP COLUMN IF EXISTS is_active CASCADE", + ); + one_statement_parses_to( + "ALTER TABLE tab DROP is_active CASCADE", + "ALTER TABLE tab DROP COLUMN is_active CASCADE", + ); fn check_one(constraint_text: &str) { match verified_stmt(&format!("ALTER TABLE tab {}", constraint_text)) {