Skip to content

Commit

Permalink
redshift: add support for CREATE VIEW … WITH NO SCHEMA BINDING (#979)
Browse files Browse the repository at this point in the history
  • Loading branch information
lustefaniak authored Oct 2, 2023
1 parent 40e2ecb commit c811e22
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ pub enum Expr {
///
/// Syntax:
/// ```sql
/// MARCH (<col>, <col>, ...) AGAINST (<expr> [<search modifier>])
/// MATCH (<col>, <col>, ...) AGAINST (<expr> [<search modifier>])
///
/// <col> = CompoundIdentifier
/// <expr> = String literal
Expand Down Expand Up @@ -1316,6 +1316,8 @@ pub enum Statement {
query: Box<Query>,
with_options: Vec<SqlOption>,
cluster_by: Vec<Ident>,
/// if true, has RedShift [`WITH NO SCHEMA BINDING`] clause <https://docs.aws.amazon.com/redshift/latest/dg/r_CREATE_VIEW.html>
with_no_schema_binding: bool,
},
/// CREATE TABLE
CreateTable {
Expand Down Expand Up @@ -2271,6 +2273,7 @@ impl fmt::Display for Statement {
materialized,
with_options,
cluster_by,
with_no_schema_binding,
} => {
write!(
f,
Expand All @@ -2288,7 +2291,11 @@ impl fmt::Display for Statement {
if !cluster_by.is_empty() {
write!(f, " CLUSTER BY ({})", display_comma_separated(cluster_by))?;
}
write!(f, " AS {query}")
write!(f, " AS {query}")?;
if *with_no_schema_binding {
write!(f, " WITH NO SCHEMA BINDING")?;
}
Ok(())
}
Statement::CreateTable {
name,
Expand Down
1 change: 1 addition & 0 deletions src/keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ define_keywords!(
BIGINT,
BIGNUMERIC,
BINARY,
BINDING,
BLOB,
BLOOMFILTER,
BOOL,
Expand Down
10 changes: 10 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2974,6 +2974,15 @@ impl<'a> Parser<'a> {
self.expect_keyword(Keyword::AS)?;
let query = Box::new(self.parse_query()?);
// Optional `WITH [ CASCADED | LOCAL ] CHECK OPTION` is widely supported here.

let with_no_schema_binding = dialect_of!(self is RedshiftSqlDialect | GenericDialect)
&& self.parse_keywords(&[
Keyword::WITH,
Keyword::NO,
Keyword::SCHEMA,
Keyword::BINDING,
]);

Ok(Statement::CreateView {
name,
columns,
Expand All @@ -2982,6 +2991,7 @@ impl<'a> Parser<'a> {
or_replace,
with_options,
cluster_by,
with_no_schema_binding,
})
}

Expand Down
12 changes: 12 additions & 0 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5320,6 +5320,7 @@ fn parse_create_view() {
materialized,
with_options,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("myschema.myview", name.to_string());
assert_eq!(Vec::<Ident>::new(), columns);
Expand All @@ -5328,6 +5329,7 @@ fn parse_create_view() {
assert!(!or_replace);
assert_eq!(with_options, vec![]);
assert_eq!(cluster_by, vec![]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand Down Expand Up @@ -5368,6 +5370,7 @@ fn parse_create_view_with_columns() {
query,
materialized,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("v", name.to_string());
assert_eq!(columns, vec![Ident::new("has"), Ident::new("cols")]);
Expand All @@ -5376,6 +5379,7 @@ fn parse_create_view_with_columns() {
assert!(!materialized);
assert!(!or_replace);
assert_eq!(cluster_by, vec![]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand All @@ -5393,6 +5397,7 @@ fn parse_create_or_replace_view() {
query,
materialized,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("v", name.to_string());
assert_eq!(columns, vec![]);
Expand All @@ -5401,6 +5406,7 @@ fn parse_create_or_replace_view() {
assert!(!materialized);
assert!(or_replace);
assert_eq!(cluster_by, vec![]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand All @@ -5422,6 +5428,7 @@ fn parse_create_or_replace_materialized_view() {
query,
materialized,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("v", name.to_string());
assert_eq!(columns, vec![]);
Expand All @@ -5430,6 +5437,7 @@ fn parse_create_or_replace_materialized_view() {
assert!(materialized);
assert!(or_replace);
assert_eq!(cluster_by, vec![]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand All @@ -5447,6 +5455,7 @@ fn parse_create_materialized_view() {
materialized,
with_options,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("myschema.myview", name.to_string());
assert_eq!(Vec::<Ident>::new(), columns);
Expand All @@ -5455,6 +5464,7 @@ fn parse_create_materialized_view() {
assert_eq!(with_options, vec![]);
assert!(!or_replace);
assert_eq!(cluster_by, vec![]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand All @@ -5472,6 +5482,7 @@ fn parse_create_materialized_view_with_cluster_by() {
materialized,
with_options,
cluster_by,
with_no_schema_binding: late_binding,
} => {
assert_eq!("myschema.myview", name.to_string());
assert_eq!(Vec::<Ident>::new(), columns);
Expand All @@ -5480,6 +5491,7 @@ fn parse_create_materialized_view_with_cluster_by() {
assert_eq!(with_options, vec![]);
assert!(!or_replace);
assert_eq!(cluster_by, vec![Ident::new("foo")]);
assert!(!late_binding);
}
_ => unreachable!(),
}
Expand Down
14 changes: 14 additions & 0 deletions tests/sqlparser_redshift.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mod test_utils;
use test_utils::*;

use sqlparser::ast::*;
use sqlparser::dialect::GenericDialect;
use sqlparser::dialect::RedshiftSqlDialect;

#[test]
Expand Down Expand Up @@ -272,6 +273,13 @@ fn redshift() -> TestedDialects {
}
}

fn redshift_and_generic() -> TestedDialects {
TestedDialects {
dialects: vec![Box::new(RedshiftSqlDialect {}), Box::new(GenericDialect {})],
options: None,
}
}

#[test]
fn test_sharp() {
let sql = "SELECT #_of_values";
Expand All @@ -281,3 +289,9 @@ fn test_sharp() {
select.projection[0]
);
}

#[test]
fn test_create_view_with_no_schema_binding() {
redshift_and_generic()
.verified_stmt("CREATE VIEW myevent AS SELECT eventname FROM event WITH NO SCHEMA BINDING");
}

0 comments on commit c811e22

Please sign in to comment.