Skip to content

Allow INSERT columns to be qualified #2260

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

Open
xitep wants to merge 1 commit into
base: main
Choose a base branch
from
+88 −30
Open

Allow INSERT columns to be qualified #2260

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
2 changes: 1 addition & 1 deletion src/ast/dml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub struct Insert {
/// `table_name foo` (for Oracle)
pub table_alias: Option<TableAliasWithoutColumns>,
/// COLUMNS
pub columns: Vec<Ident>,
pub columns: Vec<ObjectName>,
/// Overwrite (Hive)
pub overwrite: bool,
/// A SQL query that specifies what to insert
Expand Down
2 changes: 1 addition & 1 deletion src/ast/spans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ impl Spanned for Insert {
core::iter::once(insert_token.0.span)
.chain(core::iter::once(table.span()))
.chain(table_alias.iter().map(|k| k.alias.span))
.chain(columns.iter().map(|i| i.span))
.chain(columns.iter().map(|i| i.span()))
.chain(source.as_ref().map(|q| q.span()))
.chain(assignments.iter().map(|i| i.span()))
.chain(partitioned.iter().flat_map(|i| i.iter().map(|k| k.span())))
Expand Down
3 changes: 2 additions & 1 deletion src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17319,7 +17319,8 @@ impl<'a> Parser<'a> {
(vec![], None, vec![], None, None, vec![])
} else {
let (columns, partitioned, after_columns) = if !self.peek_subquery_start() {
let columns = self.parse_parenthesized_column_list(Optional, is_mysql)?;
let columns =
self.parse_parenthesized_qualified_column_list(Optional, is_mysql)?;

let partitioned = self.parse_insert_partition()?;
// Hive allows you to specify columns after partitions as well if you want.
Expand Down
5 changes: 4 additions & 1 deletion tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ fn parse_insert_values() {
assert_eq!(table_name.to_string(), expected_table_name);
assert_eq!(columns.len(), expected_columns.len());
for (index, column) in columns.iter().enumerate() {
assert_eq!(column, &Ident::new(expected_columns[index].clone()));
assert_eq!(
column,
&ObjectName::from(Ident::new(expected_columns[index].clone()))
);
}
match *source.body {
SetExpr::Values(Values {
Expand Down
67 changes: 53 additions & 14 deletions tests/sqlparser_mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,13 @@ fn parse_simple_insert() {
TableObject::TableName(ObjectName::from(vec![Ident::new("tasks")])),
table_name
);
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
assert_eq!(
vec![
ObjectName::from(Ident::new("title")),
ObjectName::from(Ident::new("priority"))
],
columns
);
assert!(on.is_none());
assert_eq!(
Some(Box::new(Query {
Expand Down Expand Up @@ -1978,7 +1984,13 @@ fn parse_ignore_insert() {
TableObject::TableName(ObjectName::from(vec![Ident::new("tasks")])),
table_name
);
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
assert_eq!(
vec![
ObjectName::from(Ident::new("title")),
ObjectName::from(Ident::new("priority"))
],
columns
);
assert!(on.is_none());
assert!(ignore);
assert_eq!(
Expand Down Expand Up @@ -2028,7 +2040,13 @@ fn parse_priority_insert() {
TableObject::TableName(ObjectName::from(vec![Ident::new("tasks")])),
table_name
);
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
assert_eq!(
vec![
ObjectName::from(Ident::new("title")),
ObjectName::from(Ident::new("priority"))
],
columns
);
assert!(on.is_none());
assert_eq!(priority, Some(HighPriority));
assert_eq!(
Expand Down Expand Up @@ -2075,7 +2093,13 @@ fn parse_priority_insert() {
TableObject::TableName(ObjectName::from(vec![Ident::new("tasks")])),
table_name
);
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
assert_eq!(
vec![
ObjectName::from(Ident::new("title")),
ObjectName::from(Ident::new("priority"))
],
columns
);
assert!(on.is_none());
assert_eq!(priority, Some(LowPriority));
assert_eq!(
Expand Down Expand Up @@ -2123,7 +2147,10 @@ fn parse_insert_as() {
TableObject::TableName(ObjectName::from(vec![Ident::with_quote('`', "table")])),
table_name
);
assert_eq!(vec![Ident::with_quote('`', "date")], columns);
assert_eq!(
vec![ObjectName::from(Ident::with_quote('`', "date"))],
columns
);
let insert_alias = insert_alias.unwrap();

assert_eq!(
Expand Down Expand Up @@ -2176,7 +2203,10 @@ fn parse_insert_as() {
table_name
);
assert_eq!(
vec![Ident::with_quote('`', "id"), Ident::with_quote('`', "date")],
vec![
ObjectName::from(Ident::with_quote('`', "id")),
ObjectName::from(Ident::with_quote('`', "date"))
],
columns
);
let insert_alias = insert_alias.unwrap();
Expand Down Expand Up @@ -2238,7 +2268,13 @@ fn parse_replace_insert() {
TableObject::TableName(ObjectName::from(vec![Ident::new("tasks")])),
table_name
);
assert_eq!(vec![Ident::new("title"), Ident::new("priority")], columns);
assert_eq!(
vec![
ObjectName::from(Ident::new("title")),
ObjectName::from(Ident::new("priority"))
],
columns
);
assert!(on.is_none());
assert!(replace_into);
assert_eq!(priority, Some(Delayed));
Expand Down Expand Up @@ -2332,12 +2368,12 @@ fn parse_insert_with_on_duplicate_update() {
);
assert_eq!(
vec![
Ident::new("name"),
Ident::new("description"),
Ident::new("perm_create"),
Ident::new("perm_read"),
Ident::new("perm_update"),
Ident::new("perm_delete")
ObjectName::from(Ident::new("name")),
ObjectName::from(Ident::new("description")),
ObjectName::from(Ident::new("perm_create")),
ObjectName::from(Ident::new("perm_read")),
ObjectName::from(Ident::new("perm_update")),
ObjectName::from(Ident::new("perm_delete"))
],
columns
);
Expand Down Expand Up @@ -2651,7 +2687,10 @@ fn parse_insert_with_numeric_prefix_column_name() {
TableObject::TableName(ObjectName::from(vec![Ident::new("s1"), Ident::new("t1")])),
table_name
);
assert_eq!(vec![Ident::new("123col_$@length123")], columns);
assert_eq!(
vec![ObjectName::from(Ident::new("123col_$@length123"))],
columns
);
}
_ => unreachable!(),
}
Expand Down
15 changes: 15 additions & 0 deletions tests/sqlparser_oracle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,21 @@ fn test_insert_with_table_alias() {
VALUES (1, 2, 3)",
);
verify_table_name_with_alias(&stmt, "foo_t", "t");

let stmt =
oracle_dialect.verified_stmt("INSERT INTO foo_t t (t.id, t.val) SELECT 1, 2 FROM dual");
verify_table_name_with_alias(&stmt, "foo_t", "t");
if let Statement::Insert(Insert { columns, .. }) = stmt {
assert_eq!(
vec![
ObjectName::from(vec![Ident::new("t"), Ident::new("id")]),
ObjectName::from(vec![Ident::new("t"), Ident::new("val")])
],
columns
);
} else {
panic!("not an insert statement");
};
}

#[test]
Expand Down
24 changes: 12 additions & 12 deletions tests/sqlparser_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5493,16 +5493,16 @@ fn test_simple_postgres_insert_with_alias() {
}
}),
columns: vec![
Ident {
ObjectName::from(Ident {
value: "id".to_string(),
quote_style: None,
span: Span::empty(),
},
Ident {
}),
ObjectName::from(Ident {
value: "a".to_string(),
quote_style: None,
span: Span::empty(),
}
})
],
overwrite: false,
source: Some(Box::new(Query {
Expand Down Expand Up @@ -5573,16 +5573,16 @@ fn test_simple_postgres_insert_with_alias() {
}
}),
columns: vec![
Ident {
ObjectName::from(Ident {
value: "id".to_string(),
quote_style: None,
span: Span::empty(),
},
Ident {
}),
ObjectName::from(Ident {
value: "a".to_string(),
quote_style: None,
span: Span::empty(),
}
})
],
overwrite: false,
source: Some(Box::new(Query {
Expand Down Expand Up @@ -5655,16 +5655,16 @@ fn test_simple_insert_with_quoted_alias() {
}
}),
columns: vec![
Ident {
ObjectName::from(Ident {
value: "id".to_string(),
quote_style: None,
span: Span::empty(),
},
Ident {
}),
ObjectName::from(Ident {
value: "a".to_string(),
quote_style: None,
span: Span::empty(),
}
})
],
overwrite: false,
source: Some(Box::new(Query {
Expand Down