Skip to content

Add support for PostgreSQL Insert table aliases (#1069) #1084

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
alamb merged 1 commit into from
Jan 14, 2024
Merged

Add support for PostgreSQL Insert table aliases (#1069) #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#[cfg(not(feature = "std"))]
use alloc::{
boxed::Box,
format,
string::{String, ToString},
vec::Vec,
};
Expand Down Expand Up @@ -1428,6 +1429,8 @@ pub enum Statement {
/// TABLE
#[cfg_attr(feature = "visitor", visit(with = "visit_relation"))]
table_name: ObjectName,
/// table_name as foo (for PostgreSQL)
table_alias: Option<Ident>,
/// COLUMNS
columns: Vec<Ident>,
/// Overwrite (Hive)
Expand Down Expand Up @@ -2400,6 +2403,7 @@ impl fmt::Display for Statement {
ignore,
into,
table_name,
table_alias,
overwrite,
partitioned,
columns,
Expand All @@ -2411,6 +2415,12 @@ impl fmt::Display for Statement {
replace_into,
priority,
} => {
let table_name = if let Some(alias) = table_alias {
format!("{table_name} AS {alias}")
} else {
table_name.to_string()
};

if let Some(action) = or {
write!(f, "INSERT OR {action} INTO {table_name} ")?;
} else {
Expand Down
9 changes: 9 additions & 0 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7456,6 +7456,14 @@ impl<'a> Parser<'a> {
// Hive lets you put table here regardless
let table = self.parse_keyword(Keyword::TABLE);
let table_name = self.parse_object_name()?;

let table_alias =
if dialect_of!(self is PostgreSqlDialect) && self.parse_keyword(Keyword::AS) {
Some(self.parse_identifier()?)
} else {
None
};

let is_mysql = dialect_of!(self is MySqlDialect);

let (columns, partitioned, after_columns, source) =
Expand Down Expand Up @@ -7530,6 +7538,7 @@ impl<'a> Parser<'a> {
Ok(Statement::Insert {
or,
table_name,
table_alias,
ignore,
into,
overwrite,
Expand Down
198 changes: 198 additions & 0 deletions tests/sqlparser_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3500,3 +3500,201 @@ fn parse_join_constraint_unnest_alias() {
}]
);
}

#[test]
fn test_complex_postgres_insert_with_alias() {
let sql1 = "WITH existing AS (SELECT test_table.id FROM test_tables AS test_table WHERE (a = 12) AND (b = 34)), inserted AS (INSERT INTO test_tables AS test_table (id, a, b, c) VALUES (DEFAULT, 56, 78, 90) ON CONFLICT(a, b) DO UPDATE SET c = EXCLUDED.c WHERE (test_table.c <> EXCLUDED.c)) SELECT c FROM existing";

pg().verified_stmt(sql1);
}

#[cfg(not(feature = "bigdecimal"))]
#[test]
fn test_simple_postgres_insert_with_alias() {
let sql2 = "INSERT INTO test_tables AS test_table (id, a) VALUES (DEFAULT, 123)";
Copy link
Copy Markdown
Contributor

@alamb alamb Jan 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please:

  1. Make the sql2 a second test (e.g. test_simple_postgres_insert_with_alias)
  2. Add a test for a quoted identifier, something like INSERT INTO test_tables AS "Test_Table" (id, a) VALUES (DEFAULT, 123), perhaps


let statement = pg().verified_stmt(sql2);

assert_eq!(
statement,
Statement::Insert {
or: None,
ignore: false,
into: true,
table_name: ObjectName(vec![Ident {
value: "test_tables".to_string(),
quote_style: None
}]),
table_alias: Some(Ident {
value: "test_table".to_string(),
quote_style: None
}),
columns: vec![
Ident {
value: "id".to_string(),
quote_style: None
},
Ident {
value: "a".to_string(),
quote_style: None
}
],
overwrite: false,
source: Some(Box::new(Query {
with: None,
body: Box::new(SetExpr::Values(Values {
explicit_row: false,
rows: vec![vec![
Expr::Identifier(Ident {
value: "DEFAULT".to_string(),
quote_style: None
}),
Expr::Value(Value::Number("123".to_string(), false))
]]
})),
order_by: vec![],
limit: None,
limit_by: vec![],
offset: None,
fetch: None,
locks: vec![],
for_clause: None
})),
partitioned: None,
after_columns: vec![],
table: false,
on: None,
returning: None,
replace_into: false,
priority: None
}
)
}

#[cfg(feature = "bigdecimal")]
#[test]
fn test_simple_postgres_insert_with_alias() {
let sql2 = "INSERT INTO test_tables AS test_table (id, a) VALUES (DEFAULT, 123)";

let statement = pg().verified_stmt(sql2);

assert_eq!(
statement,
Statement::Insert {
or: None,
ignore: false,
into: true,
table_name: ObjectName(vec![Ident {
value: "test_tables".to_string(),
quote_style: None
}]),
table_alias: Some(Ident {
value: "test_table".to_string(),
quote_style: None
}),
columns: vec![
Ident {
value: "id".to_string(),
quote_style: None
},
Ident {
value: "a".to_string(),
quote_style: None
}
],
overwrite: false,
source: Some(Box::new(Query {
with: None,
body: Box::new(SetExpr::Values(Values {
explicit_row: false,
rows: vec![vec![
Expr::Identifier(Ident {
value: "DEFAULT".to_string(),
quote_style: None
}),
Expr::Value(Value::Number(
bigdecimal::BigDecimal::new(123.into(), 0),
false
))
]]
})),
order_by: vec![],
limit: None,
limit_by: vec![],
offset: None,
fetch: None,
locks: vec![],
for_clause: None
})),
partitioned: None,
after_columns: vec![],
table: false,
on: None,
returning: None,
replace_into: false,
priority: None
}
)
}

#[test]
fn test_simple_insert_with_quoted_alias() {
let sql = r#"INSERT INTO test_tables AS "Test_Table" (id, a) VALUES (DEFAULT, '0123')"#;

let statement = pg().verified_stmt(sql);

assert_eq!(
statement,
Statement::Insert {
or: None,
ignore: false,
into: true,
table_name: ObjectName(vec![Ident {
value: "test_tables".to_string(),
quote_style: None
}]),
table_alias: Some(Ident {
value: "Test_Table".to_string(),
quote_style: Some('"')
}),
columns: vec![
Ident {
value: "id".to_string(),
quote_style: None
},
Ident {
value: "a".to_string(),
quote_style: None
}
],
overwrite: false,
source: Some(Box::new(Query {
with: None,
body: Box::new(SetExpr::Values(Values {
explicit_row: false,
rows: vec![vec![
Expr::Identifier(Ident {
value: "DEFAULT".to_string(),
quote_style: None
}),
Expr::Value(Value::SingleQuotedString("0123".to_string()))
]]
})),
order_by: vec![],
limit: None,
limit_by: vec![],
offset: None,
fetch: None,
locks: vec![],
for_clause: None
})),
partitioned: None,
after_columns: vec![],
table: false,
on: None,
returning: None,
replace_into: false,
priority: None
}
)
}