Skip to content

feat: Support SHOW COLUMNS FROM tbl FROM db #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2022
Merged

feat: Support SHOW COLUMNS FROM tbl FROM db #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238c38f
feat: Support SHOW COLUMNS FROM tbl FROM db
MazterQyou Jan 25, 2022
1f00524
Fix formatting in SHOW COLUMNS
MazterQyou Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix formatting in SHOW COLUMNS
  • Loading branch information
@MazterQyou
MazterQyou committed Jan 25, 2022
commit 1f005241a1040962606e3eaffeba8178662f9938
16 changes: 12 additions & 4 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2740,12 +2740,20 @@ impl<'a> Parser<'a> {
self.expect_one_of_keywords(&[Keyword::COLUMNS, Keyword::FIELDS])?;
self.expect_one_of_keywords(&[Keyword::FROM, Keyword::IN])?;
let table_name = self.parse_object_name()?;
let db_name = match self.parse_one_of_keywords(&[Keyword::FROM, Keyword::IN]) {
Some(_) => Some(self.parse_object_name()?),
None => None,
let double_from = self.parse_one_of_keywords(&[Keyword::FROM, Keyword::IN]);
let db_name = if double_from.is_some() {
Some(self.parse_object_name()?)
} else {
None
};
let object_name = match db_name {
Some(db_name) => ObjectName(db_name.0.into_iter().chain(table_name.0.into_iter()).collect()),
Some(db_name) => ObjectName(
db_name
.0
.into_iter()
.chain(table_name.0.into_iter())
.collect(),
),
None => table_name,
};
let filter = self.parse_show_statement_filter()?;
Expand Down
6 changes: 4 additions & 2 deletions tests/sqlparser_mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ fn parse_show_columns() {
.one_statement_parses_to("SHOW COLUMNS IN mytable", "SHOW COLUMNS FROM mytable");
mysql_and_generic()
.one_statement_parses_to("SHOW FIELDS IN mytable", "SHOW COLUMNS FROM mytable");
mysql_and_generic()
.one_statement_parses_to("SHOW COLUMNS FROM mytable FROM mydb", "SHOW COLUMNS FROM mydb.mytable");
mysql_and_generic().one_statement_parses_to(
"SHOW COLUMNS FROM mytable FROM mydb",
"SHOW COLUMNS FROM mydb.mytable",
);
}

#[test]
Expand Down