Skip to content

Commit

Permalink
Add support for ASC and DESC in CREATE TABLE column constraints for S…
Browse files Browse the repository at this point in the history
…QLite. (#1462)
  • Loading branch information
caldwell authored Oct 8, 2024
1 parent 8badcdc commit ac956dc
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/dialect/generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,8 @@ impl Dialect for GenericDialect {
fn supports_limit_comma(&self) -> bool {
true
}

fn supports_asc_desc_in_column_definition(&self) -> bool {
true
}
}
4 changes: 4 additions & 0 deletions src/dialect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,10 @@ pub trait Dialect: Debug + Any {
fn supports_explain_with_utility_options(&self) -> bool {
false
}

fn supports_asc_desc_in_column_definition(&self) -> bool {
false
}
}

/// This represents the operators for which precedence must be defined
Expand Down
4 changes: 4 additions & 0 deletions src/dialect/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,8 @@ impl Dialect for SQLiteDialect {
fn supports_limit_comma(&self) -> bool {
true
}

fn supports_asc_desc_in_column_definition(&self) -> bool {
true
}
}
14 changes: 14 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6192,6 +6192,20 @@ impl<'a> Parser<'a> {
Ok(Some(ColumnOption::DialectSpecific(vec![
Token::make_keyword("AUTOINCREMENT"),
])))
} else if self.parse_keyword(Keyword::ASC)
&& self.dialect.supports_asc_desc_in_column_definition()
{
// Support ASC for SQLite
Ok(Some(ColumnOption::DialectSpecific(vec![
Token::make_keyword("ASC"),
])))
} else if self.parse_keyword(Keyword::DESC)
&& self.dialect.supports_asc_desc_in_column_definition()
{
// Support DESC for SQLite
Ok(Some(ColumnOption::DialectSpecific(vec![
Token::make_keyword("DESC"),
])))
} else if self.parse_keywords(&[Keyword::ON, Keyword::UPDATE])
&& dialect_of!(self is MySqlDialect | GenericDialect)
{
Expand Down
37 changes: 37 additions & 0 deletions tests/sqlparser_sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,43 @@ fn parse_create_table_auto_increment() {
}
}

#[test]
fn parse_create_table_primary_key_asc_desc() {
let expected_column_def = |kind| ColumnDef {
name: "bar".into(),
data_type: DataType::Int(None),
collation: None,
options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Unique {
is_primary: true,
characteristics: None,
},
},
ColumnOptionDef {
name: None,
option: ColumnOption::DialectSpecific(vec![Token::make_keyword(kind)]),
},
],
};

let sql = "CREATE TABLE foo (bar INT PRIMARY KEY ASC)";
match sqlite_and_generic().verified_stmt(sql) {
Statement::CreateTable(CreateTable { columns, .. }) => {
assert_eq!(vec![expected_column_def("ASC")], columns);
}
_ => unreachable!(),
}
let sql = "CREATE TABLE foo (bar INT PRIMARY KEY DESC)";
match sqlite_and_generic().verified_stmt(sql) {
Statement::CreateTable(CreateTable { columns, .. }) => {
assert_eq!(vec![expected_column_def("DESC")], columns);
}
_ => unreachable!(),
}
}

#[test]
fn parse_create_sqlite_quote() {
let sql = "CREATE TABLE `PRIMARY` (\"KEY\" INT, [INDEX] INT)";
Expand Down

0 comments on commit ac956dc

Please sign in to comment.