mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-09-24 06:32:32 +00:00
Add support for ASC and DESC in CREATE TABLE column constraints for SQLite. (#1462)
This commit is contained in:
parent
8badcdc200
commit
ac956dc963
5 changed files with 63 additions and 0 deletions
|
@ -103,4 +103,8 @@ impl Dialect for GenericDialect {
|
||||||
fn supports_limit_comma(&self) -> bool {
|
fn supports_limit_comma(&self) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn supports_asc_desc_in_column_definition(&self) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -557,6 +557,10 @@ pub trait Dialect: Debug + Any {
|
||||||
fn supports_explain_with_utility_options(&self) -> bool {
|
fn supports_explain_with_utility_options(&self) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn supports_asc_desc_in_column_definition(&self) -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This represents the operators for which precedence must be defined
|
/// This represents the operators for which precedence must be defined
|
||||||
|
|
|
@ -77,4 +77,8 @@ impl Dialect for SQLiteDialect {
|
||||||
fn supports_limit_comma(&self) -> bool {
|
fn supports_limit_comma(&self) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn supports_asc_desc_in_column_definition(&self) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6192,6 +6192,20 @@ impl<'a> Parser<'a> {
|
||||||
Ok(Some(ColumnOption::DialectSpecific(vec![
|
Ok(Some(ColumnOption::DialectSpecific(vec![
|
||||||
Token::make_keyword("AUTOINCREMENT"),
|
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])
|
} else if self.parse_keywords(&[Keyword::ON, Keyword::UPDATE])
|
||||||
&& dialect_of!(self is MySqlDialect | GenericDialect)
|
&& dialect_of!(self is MySqlDialect | GenericDialect)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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]
|
#[test]
|
||||||
fn parse_create_sqlite_quote() {
|
fn parse_create_sqlite_quote() {
|
||||||
let sql = "CREATE TABLE `PRIMARY` (\"KEY\" INT, [INDEX] INT)";
|
let sql = "CREATE TABLE `PRIMARY` (\"KEY\" INT, [INDEX] INT)";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue