Skip to content

Commit 4827bf5

Browse files
committed
Refactor NamedTable to be a regular struct
1 parent 9c428b1 commit 4827bf5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/ast/data_type.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ pub enum DataType {
5151
/// [MsSQL]: https://learn.microsoft.com/en-us/sql/t-sql/statements/create-function-transact-sql?view=sql-server-ver16#c-create-a-multi-statement-table-valued-function
5252
Table(Option<Vec<ColumnDef>>),
5353
/// Table type with a name, e.g. CREATE FUNCTION RETURNS @result TABLE(...).
54-
NamedTable(
54+
NamedTable {
5555
/// Table name.
56-
ObjectName,
56+
name: ObjectName,
5757
/// Table columns.
58-
Vec<ColumnDef>,
59-
),
58+
columns: Vec<ColumnDef>,
59+
},
6060
/// Fixed-length character type, e.g. CHARACTER(10).
6161
Character(Option<CharacterLength>),
6262
/// Fixed-length char type, e.g. CHAR(10).
@@ -732,8 +732,8 @@ impl fmt::Display for DataType {
732732
write!(f, "TABLE")
733733
}
734734
},
735-
DataType::NamedTable(name, fields) => {
736-
write!(f, "{} TABLE ({})", name, display_comma_separated(fields))
735+
DataType::NamedTable { name, columns } => {
736+
write!(f, "{} TABLE ({})", name, display_comma_separated(columns))
737737
}
738738
DataType::GeometricType(kind) => write!(f, "{}", kind),
739739
}

src/parser/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5241,10 +5241,10 @@ impl<'a> Parser<'a> {
52415241
)?,
52425242
};
52435243

5244-
Ok(DataType::NamedTable(
5245-
ObjectName(vec![ObjectNamePart::Identifier(return_table_name)]),
5246-
table_column_defs,
5247-
))
5244+
Ok(DataType::NamedTable {
5245+
name: ObjectName(vec![ObjectNamePart::Identifier(return_table_name)]),
5246+
columns: table_column_defs,
5247+
})
52485248
})?;
52495249

52505250
let return_type = if return_table.is_some() {

0 commit comments

Comments
 (0)