Skip to content

Refactored ColumnOption::Unique to reuse UniqueConstraint and PrimaryKeyConstraint #2064

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
merged 6 commits into from
Oct 21, 2025
+152 −54
Merged

Refactored ColumnOption::Unique to reuse UniqueConstraint and PrimaryKeyConstraint #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a359663
Refactored `ColumnOption::Unique` to reuse `UniqueConstraint` and `Pr…
LucaCappelletti94 Oct 9, 2025
d2e0642
Merge branch 'main' into unique-unique-constraint
LucaCappelletti94 Oct 10, 2025
84ce852
Merge branch 'main' into unique-unique-constraint
LucaCappelletti94 Oct 13, 2025
b9326fe
Refactored to not have column ident duplication
LucaCappelletti94 Oct 13, 2025
961b1be
Merge branch 'main' into unique-unique-constraint
LucaCappelletti94 Oct 15, 2025
95f0086
Merge branch 'main' into unique-unique-constraint
LucaCappelletti94 Oct 16, 2025
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
58 changes: 46 additions & 12 deletions src/ast/ddl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ use sqlparser_derive::{Visit, VisitMut};
use crate::ast::value::escape_single_quote_string;
use crate::ast::{
display_comma_separated, display_separated,
table_constraints::{CheckConstraint, ForeignKeyConstraint, TableConstraint},
table_constraints::{
CheckConstraint, ForeignKeyConstraint, PrimaryKeyConstraint, TableConstraint,
UniqueConstraint,
},
ArgMode, AttachedToken, CommentDef, ConditionalStatements, CreateFunctionBody,
CreateFunctionUsing, CreateTableLikeKind, CreateTableOptions, CreateViewParams, DataType, Expr,
FileFormat, FunctionBehavior, FunctionCalledOnNull, FunctionDesc, FunctionDeterminismSpecifier,
Expand All @@ -55,6 +58,22 @@ pub struct IndexColumn {
pub operator_class: Option<Ident>,
}

impl From<Ident> for IndexColumn {
fn from(c: Ident) -> Self {
Self {
column: OrderByExpr::from(c),
operator_class: None,
}
}
}

impl<'a> From<&'a str> for IndexColumn {
fn from(c: &'a str) -> Self {
let ident = Ident::new(c);
ident.into()
}
}

impl fmt::Display for IndexColumn {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.column)?;
Expand Down Expand Up @@ -1555,11 +1574,10 @@ pub enum ColumnOption {
/// [ClickHouse](https://clickhouse.com/docs/en/sql-reference/statements/create/table#default_values)
Alias(Expr),

/// `{ PRIMARY KEY | UNIQUE } [<constraint_characteristics>]`
Unique {
is_primary: bool,
characteristics: Option<ConstraintCharacteristics>,
},
/// `PRIMARY KEY [<constraint_characteristics>]`
PrimaryKey(PrimaryKeyConstraint),
/// `UNIQUE [<constraint_characteristics>]`
Unique(UniqueConstraint),
/// A referential integrity constraint (`REFERENCES <foreign_table> (<referred_columns>)
/// [ MATCH { FULL | PARTIAL | SIMPLE } ]
/// { [ON DELETE <referential_action>] [ON UPDATE <referential_action>] |
Expand Down Expand Up @@ -1638,6 +1656,18 @@ pub enum ColumnOption {
Invisible,
}

impl From<UniqueConstraint> for ColumnOption {
fn from(c: UniqueConstraint) -> Self {
ColumnOption::Unique(c)
}
}

impl From<PrimaryKeyConstraint> for ColumnOption {
fn from(c: PrimaryKeyConstraint) -> Self {
ColumnOption::PrimaryKey(c)
}
}

impl From<CheckConstraint> for ColumnOption {
fn from(c: CheckConstraint) -> Self {
ColumnOption::Check(c)
Expand Down Expand Up @@ -1665,12 +1695,16 @@ impl fmt::Display for ColumnOption {
}
}
Alias(expr) => write!(f, "ALIAS {expr}"),
Unique {
is_primary,
characteristics,
} => {
write!(f, "{}", if *is_primary { "PRIMARY KEY" } else { "UNIQUE" })?;
if let Some(characteristics) = characteristics {
PrimaryKey(constraint) => {
write!(f, "PRIMARY KEY")?;
if let Some(characteristics) = &constraint.characteristics {
write!(f, " {characteristics}")?;
}
Ok(())
}
Unique(constraint) => {
write!(f, "UNIQUE")?;
if let Some(characteristics) = &constraint.characteristics {
write!(f, " {characteristics}")?;
}
Ok(())
Expand Down
12 changes: 11 additions & 1 deletion src/ast/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,6 +2506,16 @@ pub struct OrderByExpr {
pub with_fill: Option<WithFill>,
}

impl From<Ident> for OrderByExpr {
fn from(ident: Ident) -> Self {
OrderByExpr {
expr: Expr::Identifier(ident),
options: OrderByOptions::default(),
with_fill: None,
}
}
}

impl fmt::Display for OrderByExpr {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}{}", self.expr, self.options)?;
Expand Down Expand Up @@ -2574,7 +2584,7 @@ impl fmt::Display for InterpolateExpr {
}
}

#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
#[derive(Default, Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
pub struct OrderByOptions {
Expand Down
6 changes: 4 additions & 2 deletions src/ast/spans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,8 @@ impl Spanned for RaiseStatementValue {
/// - [ColumnOption::Null]
/// - [ColumnOption::NotNull]
/// - [ColumnOption::Comment]
/// - [ColumnOption::Unique]¨
/// - [ColumnOption::PrimaryKey]
/// - [ColumnOption::Unique]
/// - [ColumnOption::DialectSpecific]
/// - [ColumnOption::Generated]
impl Spanned for ColumnOption {
Expand All @@ -740,7 +741,8 @@ impl Spanned for ColumnOption {
ColumnOption::Materialized(expr) => expr.span(),
ColumnOption::Ephemeral(expr) => expr.as_ref().map_or(Span::empty(), |e| e.span()),
ColumnOption::Alias(expr) => expr.span(),
ColumnOption::Unique { .. } => Span::empty(),
ColumnOption::PrimaryKey(constraint) => constraint.span(),
ColumnOption::Unique(constraint) => constraint.span(),
ColumnOption::Check(constraint) => constraint.span(),
ColumnOption::ForeignKey(constraint) => constraint.span(),
ColumnOption::DialectSpecific(_) => Span::empty(),
Expand Down
32 changes: 24 additions & 8 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8050,16 +8050,32 @@ impl<'a> Parser<'a> {
}
} else if self.parse_keywords(&[Keyword::PRIMARY, Keyword::KEY]) {
let characteristics = self.parse_constraint_characteristics()?;
Ok(Some(ColumnOption::Unique {
is_primary: true,
characteristics,
}))
Ok(Some(
PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics,
}
.into(),
))
} else if self.parse_keyword(Keyword::UNIQUE) {
let characteristics = self.parse_constraint_characteristics()?;
Ok(Some(ColumnOption::Unique {
is_primary: false,
characteristics,
}))
Ok(Some(
UniqueConstraint {
name: None,
index_name: None,
index_type_display: KeyOrIndexDisplay::None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics,
nulls_distinct: NullsDistinctOption::None,
}
.into(),
))
} else if self.parse_keyword(Keyword::REFERENCES) {
let foreign_table = self.parse_object_name(false)?;
// PostgreSQL allows omitting the column list and
Expand Down
40 changes: 28 additions & 12 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3763,21 +3763,31 @@ fn parse_create_table() {
},
ColumnOptionDef {
name: Some("pkey".into()),
option: ColumnOption::Unique {
is_primary: true,
characteristics: None
},
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
}),
},
ColumnOptionDef {
name: None,
option: ColumnOption::NotNull,
},
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: false,
characteristics: None
},
option: ColumnOption::Unique(UniqueConstraint {
name: None,
index_name: None,
index_type_display: KeyOrIndexDisplay::None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
nulls_distinct: NullsDistinctOption::None,
}),
},
ColumnOptionDef {
name: None,
Expand Down Expand Up @@ -4106,10 +4116,16 @@ fn parse_create_table_column_constraint_characteristics() {
data_type: DataType::Int(None),
options: vec![ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: false,
characteristics: expected_value
}
option: ColumnOption::Unique(UniqueConstraint {
name: None,
index_name: None,
index_type_display: KeyOrIndexDisplay::None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: expected_value,
nulls_distinct: NullsDistinctOption::None,
})
}]
}],
"{message}"
Expand Down
36 changes: 24 additions & 12 deletions tests/sqlparser_mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,14 @@ fn parse_create_table_auto_increment() {
options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
characteristics: None
},
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
}),
},
ColumnOptionDef {
name: None,
Expand Down Expand Up @@ -743,10 +747,14 @@ fn parse_create_table_primary_and_unique_key() {
options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
characteristics: None
},
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
}),
},
ColumnOptionDef {
name: None,
Expand Down Expand Up @@ -1382,10 +1390,14 @@ fn parse_quote_identifiers() {
data_type: DataType::Int(None),
options: vec![ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
characteristics: None
},
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
}),
}],
}],
columns
Expand Down
22 changes: 15 additions & 7 deletions tests/sqlparser_sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,14 @@ fn parse_create_table_auto_increment() {
options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
characteristics: None
},
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
}),
},
ColumnOptionDef {
name: None,
Expand All @@ -245,10 +249,14 @@ fn parse_create_table_primary_key_asc_desc() {
options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
option: ColumnOption::PrimaryKey(PrimaryKeyConstraint {
name: None,
index_name: None,
index_type: None,
columns: vec![],
index_options: vec![],
characteristics: None,
},
}),
},
ColumnOptionDef {
name: None,
Expand Down