Add support for INHERITS option in CREATE TABLE statement (#1806)

This commit is contained in:
Luca Cappelletti 2025-04-12 18:03:43 +02:00 committed by GitHub
parent bbc80d7537
commit 896c088153
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 71 additions and 2 deletions

View file

@ -182,6 +182,11 @@ pub struct CreateTable {
/// BigQuery: Table options list. /// BigQuery: Table options list.
/// <https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#table_option_list> /// <https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#table_option_list>
pub options: Option<Vec<SqlOption>>, pub options: Option<Vec<SqlOption>>,
/// Postgres `INHERITs` clause, which contains the list of tables from which
/// the new table inherits.
/// <https://www.postgresql.org/docs/current/ddl-inherit.html>
/// <https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-INHERITS>
pub inherits: Option<Vec<ObjectName>>,
/// SQLite "STRICT" clause. /// SQLite "STRICT" clause.
/// if the "STRICT" table-option keyword is added to the end, after the closing ")", /// if the "STRICT" table-option keyword is added to the end, after the closing ")",
/// then strict typing rules apply to that table. /// then strict typing rules apply to that table.
@ -405,6 +410,9 @@ impl Display for CreateTable {
if let Some(order_by) = &self.order_by { if let Some(order_by) = &self.order_by {
write!(f, " ORDER BY {}", order_by)?; write!(f, " ORDER BY {}", order_by)?;
} }
if let Some(inherits) = &self.inherits {
write!(f, " INHERITS ({})", display_comma_separated(inherits))?;
}
if let Some(partition_by) = self.partition_by.as_ref() { if let Some(partition_by) = self.partition_by.as_ref() {
write!(f, " PARTITION BY {partition_by}")?; write!(f, " PARTITION BY {partition_by}")?;
} }

View file

@ -97,6 +97,7 @@ pub struct CreateTableBuilder {
pub cluster_by: Option<WrappedCollection<Vec<Ident>>>, pub cluster_by: Option<WrappedCollection<Vec<Ident>>>,
pub clustered_by: Option<ClusteredBy>, pub clustered_by: Option<ClusteredBy>,
pub options: Option<Vec<SqlOption>>, pub options: Option<Vec<SqlOption>>,
pub inherits: Option<Vec<ObjectName>>,
pub strict: bool, pub strict: bool,
pub copy_grants: bool, pub copy_grants: bool,
pub enable_schema_evolution: Option<bool>, pub enable_schema_evolution: Option<bool>,
@ -151,6 +152,7 @@ impl CreateTableBuilder {
cluster_by: None, cluster_by: None,
clustered_by: None, clustered_by: None,
options: None, options: None,
inherits: None,
strict: false, strict: false,
copy_grants: false, copy_grants: false,
enable_schema_evolution: None, enable_schema_evolution: None,
@ -331,6 +333,11 @@ impl CreateTableBuilder {
self self
} }
pub fn inherits(mut self, inherits: Option<Vec<ObjectName>>) -> Self {
self.inherits = inherits;
self
}
pub fn strict(mut self, strict: bool) -> Self { pub fn strict(mut self, strict: bool) -> Self {
self.strict = strict; self.strict = strict;
self self
@ -451,6 +458,7 @@ impl CreateTableBuilder {
cluster_by: self.cluster_by, cluster_by: self.cluster_by,
clustered_by: self.clustered_by, clustered_by: self.clustered_by,
options: self.options, options: self.options,
inherits: self.inherits,
strict: self.strict, strict: self.strict,
copy_grants: self.copy_grants, copy_grants: self.copy_grants,
enable_schema_evolution: self.enable_schema_evolution, enable_schema_evolution: self.enable_schema_evolution,
@ -512,6 +520,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
cluster_by, cluster_by,
clustered_by, clustered_by,
options, options,
inherits,
strict, strict,
copy_grants, copy_grants,
enable_schema_evolution, enable_schema_evolution,
@ -560,6 +569,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
cluster_by, cluster_by,
clustered_by, clustered_by,
options, options,
inherits,
strict, strict,
iceberg, iceberg,
copy_grants, copy_grants,
@ -591,6 +601,7 @@ pub(crate) struct CreateTableConfiguration {
pub partition_by: Option<Box<Expr>>, pub partition_by: Option<Box<Expr>>,
pub cluster_by: Option<WrappedCollection<Vec<Ident>>>, pub cluster_by: Option<WrappedCollection<Vec<Ident>>>,
pub options: Option<Vec<SqlOption>>, pub options: Option<Vec<SqlOption>>,
pub inherits: Option<Vec<ObjectName>>,
} }
#[cfg(test)] #[cfg(test)]

View file

@ -581,6 +581,7 @@ impl Spanned for CreateTable {
cluster_by: _, // todo, BigQuery specific cluster_by: _, // todo, BigQuery specific
clustered_by: _, // todo, Hive specific clustered_by: _, // todo, Hive specific
options: _, // todo, BigQuery specific options: _, // todo, BigQuery specific
inherits: _, // todo, PostgreSQL specific
strict: _, // bool strict: _, // bool
copy_grants: _, // bool copy_grants: _, // bool
enable_schema_evolution: _, // bool enable_schema_evolution: _, // bool

View file

@ -430,6 +430,7 @@ define_keywords!(
INDEX, INDEX,
INDICATOR, INDICATOR,
INHERIT, INHERIT,
INHERITS,
INITIALLY, INITIALLY,
INNER, INNER,
INOUT, INOUT,

View file

@ -7050,6 +7050,7 @@ impl<'a> Parser<'a> {
.partition_by(create_table_config.partition_by) .partition_by(create_table_config.partition_by)
.cluster_by(create_table_config.cluster_by) .cluster_by(create_table_config.cluster_by)
.options(create_table_config.options) .options(create_table_config.options)
.inherits(create_table_config.inherits)
.primary_key(primary_key) .primary_key(primary_key)
.strict(strict) .strict(strict)
.build()) .build())
@ -7070,13 +7071,20 @@ impl<'a> Parser<'a> {
} }
} }
/// Parse configuration like partitioning, clustering information during the table creation. /// Parse configuration like inheritance, partitioning, clustering information during the table creation.
/// ///
/// [BigQuery](https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#syntax_2) /// [BigQuery](https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#syntax_2)
/// [PostgreSQL](https://www.postgresql.org/docs/current/ddl-partitioning.html) /// [PostgreSQL Partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html)
/// [PostgreSQL Inheritance](https://www.postgresql.org/docs/current/ddl-inherit.html)
fn parse_optional_create_table_config( fn parse_optional_create_table_config(
&mut self, &mut self,
) -> Result<CreateTableConfiguration, ParserError> { ) -> Result<CreateTableConfiguration, ParserError> {
let inherits = if self.parse_keyword(Keyword::INHERITS) {
Some(self.parse_parenthesized_qualified_column_list(IsOptional::Mandatory, false)?)
} else {
None
};
let partition_by = if dialect_of!(self is BigQueryDialect | PostgreSqlDialect | GenericDialect) let partition_by = if dialect_of!(self is BigQueryDialect | PostgreSqlDialect | GenericDialect)
&& self.parse_keywords(&[Keyword::PARTITION, Keyword::BY]) && self.parse_keywords(&[Keyword::PARTITION, Keyword::BY])
{ {
@ -7105,6 +7113,7 @@ impl<'a> Parser<'a> {
partition_by, partition_by,
cluster_by, cluster_by,
options, options,
inherits,
}) })
} }

View file

@ -756,6 +756,7 @@ fn test_duckdb_union_datatype() {
cluster_by: Default::default(), cluster_by: Default::default(),
clustered_by: Default::default(), clustered_by: Default::default(),
options: Default::default(), options: Default::default(),
inherits: Default::default(),
strict: Default::default(), strict: Default::default(),
copy_grants: Default::default(), copy_grants: Default::default(),
enable_schema_evolution: Default::default(), enable_schema_evolution: Default::default(),

View file

@ -1594,6 +1594,7 @@ fn parse_create_table_with_valid_options() {
cluster_by: None, cluster_by: None,
clustered_by: None, clustered_by: None,
options: None, options: None,
inherits: None,
strict: false, strict: false,
iceberg: false, iceberg: false,
copy_grants: false, copy_grants: false,
@ -1764,6 +1765,7 @@ fn parse_create_table_with_identity_column() {
cluster_by: None, cluster_by: None,
clustered_by: None, clustered_by: None,
options: None, options: None,
inherits: None,
strict: false, strict: false,
copy_grants: false, copy_grants: false,
enable_schema_evolution: None, enable_schema_evolution: None,

View file

@ -2733,6 +2733,41 @@ fn parse_create_brin() {
} }
} }
#[test]
fn parse_create_table_with_inherits() {
let single_inheritance_sql =
"CREATE TABLE child_table (child_column INT) INHERITS (public.parent_table)";
match pg().verified_stmt(single_inheritance_sql) {
Statement::CreateTable(CreateTable {
inherits: Some(inherits),
..
}) => {
assert_eq_vec(&["public", "parent_table"], &inherits[0].0);
}
_ => unreachable!(),
}
let double_inheritance_sql = "CREATE TABLE child_table (child_column INT) INHERITS (public.parent_table, pg_catalog.pg_settings)";
match pg().verified_stmt(double_inheritance_sql) {
Statement::CreateTable(CreateTable {
inherits: Some(inherits),
..
}) => {
assert_eq_vec(&["public", "parent_table"], &inherits[0].0);
assert_eq_vec(&["pg_catalog", "pg_settings"], &inherits[1].0);
}
_ => unreachable!(),
}
}
#[test]
fn parse_create_table_with_empty_inherits_fails() {
assert!(matches!(
pg().parse_sql_statements("CREATE TABLE child_table (child_column INT) INHERITS ()"),
Err(ParserError::ParserError(_))
));
}
#[test] #[test]
fn parse_create_index_concurrently() { fn parse_create_index_concurrently() {
let sql = "CREATE INDEX CONCURRENTLY IF NOT EXISTS my_index ON my_table(col1,col2)"; let sql = "CREATE INDEX CONCURRENTLY IF NOT EXISTS my_index ON my_table(col1,col2)";
@ -5426,6 +5461,7 @@ fn parse_trigger_related_functions() {
cluster_by: None, cluster_by: None,
clustered_by: None, clustered_by: None,
options: None, options: None,
inherits: None,
strict: false, strict: false,
copy_grants: false, copy_grants: false,
enable_schema_evolution: None, enable_schema_evolution: None,