-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #281 from Qrlew/support_rereading
Support for parsing CTEs with column aliases
- Loading branch information
Showing
9 changed files
with
383 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| //! Data structures and visitor to collect aliases associated to CTEs query. | ||
|
|
||
| use crate::{ast, sql::visitor::Visitor, visitor::Visited}; | ||
| use colored::Colorize; | ||
| use itertools::Itertools; | ||
| use std::{ | ||
| collections::BTreeMap, | ||
| fmt, | ||
| iter::Iterator, | ||
| ops::{Deref, DerefMut}, | ||
| }; | ||
|
|
||
| /// A mapping between a Query the column aliases associated to it. | ||
| /// It is used to correctly associate aliases to queries in CTEs with column aliases (e.g. WITH tab (a, b, c) AS (SELECT...)). | ||
| #[derive(Clone, Debug, Hash, PartialEq, Eq)] | ||
| pub struct QueryAliases<'a>(BTreeMap<&'a ast::Query, Option<&'a Vec<ast::Ident>>>); | ||
|
|
||
| impl<'a> QueryAliases<'a> { | ||
| /// Build a new QueryAliases object | ||
| pub fn new() -> Self { | ||
| QueryAliases(BTreeMap::new()) | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Deref for QueryAliases<'a> { | ||
| type Target = BTreeMap<&'a ast::Query, Option<&'a Vec<ast::Ident>>>; | ||
|
|
||
| fn deref(&self) -> &Self::Target { | ||
| &self.0 | ||
| } | ||
| } | ||
|
|
||
| impl<'a> DerefMut for QueryAliases<'a> { | ||
| fn deref_mut(&mut self) -> &mut Self::Target { | ||
| &mut self.0 | ||
| } | ||
| } | ||
|
|
||
| impl<'a> IntoIterator for QueryAliases<'a> { | ||
| type Item = <BTreeMap<&'a ast::Query, Option<&'a Vec<ast::Ident>>> as IntoIterator>::Item; | ||
| type IntoIter = | ||
| <BTreeMap<&'a ast::Query, Option<&'a Vec<ast::Ident>>> as IntoIterator>::IntoIter; | ||
|
|
||
| fn into_iter(self) -> Self::IntoIter { | ||
| self.0.into_iter() | ||
| } | ||
| } | ||
|
|
||
| impl<'a> fmt::Display for QueryAliases<'a> { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| write!( | ||
| f, | ||
| "Query Aliases\n{}", | ||
| self.0 | ||
| .iter() | ||
| .map(|(q, r)| match r { | ||
| Some(r) => format!( | ||
| "{} -> {}", | ||
| format!("{q}").blue(), | ||
| format!("({})", r.iter().join(", ")).green() | ||
| ), | ||
| None => format!( | ||
| "{} -> {}", | ||
| format!("{q}").blue(), | ||
| format!("?").bold().green() | ||
| ), | ||
| }) | ||
| .join(",\n") | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /// A visitor to build a reference free query tree | ||
| #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)] | ||
| pub struct IntoQueryAliasesVisitor; | ||
|
|
||
| impl<'a> Visitor<'a, QueryAliases<'a>> for IntoQueryAliasesVisitor { | ||
| fn query( | ||
| &self, | ||
| query: &'a ast::Query, | ||
| _dependencies: Visited<'a, ast::Query, QueryAliases<'a>>, | ||
| ) -> QueryAliases<'a> { | ||
| let mut query_aliases = QueryAliases::new(); | ||
| if let Some(with) = &query.with { | ||
| for cte in &with.cte_tables { | ||
| if !cte.alias.columns.is_empty() { | ||
| query_aliases.insert(cte.query.as_ref(), Some(cte.alias.columns.as_ref())); | ||
| } | ||
| } | ||
| } | ||
| query_aliases | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use colored::Colorize; | ||
|
|
||
| use super::*; | ||
| use crate::{sql::relation, visitor::Acceptor as _}; | ||
|
|
||
| #[test] | ||
| fn test_query_aliases() { | ||
| let query_1 = relation::parse("select * from table_1").unwrap(); | ||
| let query_2 = relation::parse("select * from table_2").unwrap(); | ||
| let aliases_query_2: Vec<ast::Ident> = vec!["aa".into(), "bb".into(), "cc".into()]; | ||
| let query_3 = relation::parse("select * from table_3").unwrap(); | ||
| let aliases_query_3: Vec<ast::Ident> = vec!["aaa".into(), "bbb".into(), "ccc".into()]; | ||
|
|
||
| println!("query_1 = {}", query_1.to_string().blue()); | ||
| let mut query_aliases_1 = QueryAliases::new(); | ||
| let mut query_aliases_2 = QueryAliases::new(); | ||
| let mut query_aliases_3 = QueryAliases::new(); | ||
|
|
||
| query_aliases_2.insert(&query_1, None); | ||
| query_aliases_2.insert(&query_2, Some(&aliases_query_2)); | ||
| println!("query_aliases_2: {query_aliases_2}"); | ||
|
|
||
| query_aliases_3.insert(&query_3, Some(&aliases_query_3)); | ||
| query_aliases_3.insert(&query_2, None); | ||
| query_aliases_3.insert(&query_1, None); | ||
| println!("query_aliases_3: {query_aliases_3}"); | ||
|
|
||
| query_aliases_1.extend(query_aliases_2); | ||
| query_aliases_1.extend(query_aliases_3); | ||
| println!("query_aliases_1: {query_aliases_1}"); | ||
| } | ||
|
|
||
| const COMPLEX_QUERY: &str = " | ||
| WITH | ||
| view_1 (a, b, c) as (select * from schema.table_1), | ||
| view_2 (aa, bb, cc) as (select * from view_1) | ||
| SELECT 2*new_a, b+1 | ||
| FROM ( | ||
| SELECT view_2.cc as new_a, right.d as b FROM (SELECT * FROM view_2) LEFT OUTER JOIN schema.table_2 as right ON view_1.a = table_2.id | ||
| ); | ||
| select * from table_1; | ||
| "; | ||
|
|
||
| #[test] | ||
| fn test_query_aliases_visitor() { | ||
| let query = relation::parse(COMPLEX_QUERY).unwrap(); | ||
| println!("Query = {}", query.to_string().blue()); | ||
| let visitor = IntoQueryAliasesVisitor; | ||
| let query_aliases = query.accept(visitor); | ||
| println!("{}", query_aliases); | ||
| } | ||
| } |
Oops, something went wrong.