Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions examples/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ $ cargo run --example cli - [--dialectname]
"--postgres" => Box::new(PostgreSqlDialect {}),
"--ms" => Box::new(MsSqlDialect {}),
"--mysql" => Box::new(MySqlDialect {}),
"--doris" => Box::new(DorisDialect {}),
"--snowflake" => Box::new(SnowflakeDialect {}),
"--hive" => Box::new(HiveDialect {}),
"--redshift" => Box::new(RedshiftSqlDialect {}),
Expand Down
13 changes: 13 additions & 0 deletions src/ast/ddl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2001,6 +2001,12 @@ pub enum ColumnOption {
/// ```
/// [MySQL]: https://dev.mysql.com/doc/refman/8.4/en/invisible-columns.html
Invisible,
/// Column-level auto-increment option with an optional start value.
///
/// MySQL and Generic use this unified AST node without a start value.
/// Dialects that support a start value can use `Some`.
/// Syntax: `AUTO_INCREMENT` or `AUTO_INCREMENT(<start_value>)`.
AutoIncrement(Option<u64>),
}

impl From<UniqueConstraint> for ColumnOption {
Expand Down Expand Up @@ -2149,6 +2155,13 @@ impl fmt::Display for ColumnOption {
Invisible => {
write!(f, "INVISIBLE")
}
AutoIncrement(start) => {
f.write_str("AUTO_INCREMENT")?;
if let Some(start) = start {
write!(f, "({start})")?;
}
Ok(())
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/ast/spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ impl Spanned for RaiseStatementValue {
/// - [ColumnOption::PrimaryKey]
/// - [ColumnOption::Unique]
/// - [ColumnOption::DialectSpecific]
/// - [ColumnOption::AutoIncrement]
/// - [ColumnOption::Generated]
impl Spanned for ColumnOption {
fn span(&self) -> Span {
Expand Down Expand Up @@ -849,6 +850,7 @@ impl Spanned for ColumnOption {
ColumnOption::Tags(..) => Span::empty(),
ColumnOption::Srid(..) => Span::empty(),
ColumnOption::Invisible => Span::empty(),
ColumnOption::AutoIncrement(_) => Span::empty(),
}
}
}
Expand Down
53 changes: 53 additions & 0 deletions src/dialect/doris.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

use crate::dialect::Dialect;

/// A [`Dialect`] for [Apache Doris](https://doris.apache.org/).
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct DorisDialect {}

impl Dialect for DorisDialect {
fn is_delimited_identifier_start(&self, ch: char) -> bool {
ch == '`'
}

fn identifier_quote_style(&self, _identifier: &str) -> Option<char> {
Some('`')
}

fn is_identifier_start(&self, ch: char) -> bool {
ch.is_ascii_alphabetic() || ch == '_' || !ch.is_ascii()
}

fn is_identifier_part(&self, ch: char) -> bool {
self.is_identifier_start(ch) || ch.is_ascii_digit()
}

fn supports_string_literal_backslash_escape(&self) -> bool {
true
}

fn ignores_wildcard_escapes(&self) -> bool {
true
}

fn supports_numeric_prefix(&self) -> bool {
true
}
}
5 changes: 5 additions & 0 deletions src/dialect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ mod ansi;
mod bigquery;
mod clickhouse;
mod databricks;
mod doris;
mod duckdb;
mod generic;
mod hive;
Expand All @@ -43,6 +44,7 @@ pub use self::ansi::AnsiDialect;
pub use self::bigquery::BigQueryDialect;
pub use self::clickhouse::ClickHouseDialect;
pub use self::databricks::DatabricksDialect;
pub use self::doris::DorisDialect;
pub use self::duckdb::DuckDbDialect;
pub use self::generic::GenericDialect;
pub use self::hive::HiveDialect;
Expand Down Expand Up @@ -1883,6 +1885,7 @@ pub fn dialect_from_str(dialect_name: impl AsRef<str>) -> Option<Box<dyn Dialect
"bigquery" => Some(Box::new(BigQueryDialect)),
"ansi" => Some(Box::new(AnsiDialect {})),
"duckdb" => Some(Box::new(DuckDbDialect {})),
"doris" => Some(Box::new(DorisDialect {})),
"databricks" => Some(Box::new(DatabricksDialect {})),
"spark" | "sparksql" => Some(Box::new(SparkSqlDialect {})),
"oracle" => Some(Box::new(OracleDialect {})),
Expand Down Expand Up @@ -1938,6 +1941,8 @@ mod tests {
assert!(parse_dialect("ANSI").is::<AnsiDialect>());
assert!(parse_dialect("duckdb").is::<DuckDbDialect>());
assert!(parse_dialect("DuckDb").is::<DuckDbDialect>());
assert!(parse_dialect("doris").is::<DorisDialect>());
assert!(parse_dialect("Doris").is::<DorisDialect>());
assert!(parse_dialect("DataBricks").is::<DatabricksDialect>());
assert!(parse_dialect("databricks").is::<DatabricksDialect>());
assert!(parse_dialect("teradata").is::<TeradataDialect>());
Expand Down
4 changes: 1 addition & 3 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9657,9 +9657,7 @@ impl<'a> Parser<'a> {
&& dialect_of!(self is MySqlDialect | GenericDialect)
{
// Support AUTO_INCREMENT for MySQL
Ok(Some(ColumnOption::DialectSpecific(vec![
Token::make_keyword("AUTO_INCREMENT"),
])))
Ok(Some(ColumnOption::AutoIncrement(None)))
} else if self.parse_keyword(Keyword::AUTOINCREMENT)
&& dialect_of!(self is SQLiteDialect | GenericDialect)
{
Expand Down
1 change: 1 addition & 0 deletions src/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ pub fn all_dialects() -> TestedDialects {
Box::new(HiveDialect {}),
Box::new(RedshiftSqlDialect {}),
Box::new(MySqlDialect {}),
Box::new(DorisDialect {}),
Box::new(BigQueryDialect {}),
Box::new(SQLiteDialect {}),
Box::new(DuckDbDialect {}),
Expand Down
55 changes: 55 additions & 0 deletions tests/sqlparser_doris.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#![warn(clippy::all)]
//! Test SQL syntax specific to Apache Doris.

#[macro_use]
mod test_utils;

use sqlparser::dialect::{Dialect, DorisDialect, GenericDialect};
use test_utils::*;

fn doris() -> TestedDialects {
TestedDialects::new(vec![Box::new(DorisDialect {})])
}

fn doris_and_generic() -> TestedDialects {
TestedDialects::new(vec![Box::new(DorisDialect {}), Box::new(GenericDialect {})])
}

#[test]
fn doris_identifier_and_string_literal_gates() {
let dialect = DorisDialect {};
assert_eq!(dialect.identifier_quote_style("identifier"), Some('`'));
assert!(dialect.is_delimited_identifier_start('`'));
assert!(dialect.supports_string_literal_backslash_escape());
assert!(dialect.ignores_wildcard_escapes());
assert!(dialect.supports_numeric_prefix());
}

#[test]
fn parse_doris_strings_and_identifiers() {
doris().verified_stmt(
r#"SELECT "double quoted string", 'single quoted string', `select` FROM `db`.`table`"#,
);
}

#[test]
fn doris_and_generic_parse_common_sql_identically() {
doris_and_generic().verified_stmt("SELECT 1 AS properties FROM t");
}
9 changes: 2 additions & 7 deletions tests/sqlparser_mysql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ use sqlparser::ast::*;
use sqlparser::dialect::{GenericDialect, MySqlDialect};
use sqlparser::parser::{ParserError, ParserOptions};
use sqlparser::tokenizer::Span;
use sqlparser::tokenizer::Token;
use test_utils::*;

#[macro_use]
Expand Down Expand Up @@ -661,9 +660,7 @@ fn parse_create_table_auto_increment() {
},
ColumnOptionDef {
name: None,
option: ColumnOption::DialectSpecific(vec![Token::make_keyword(
"AUTO_INCREMENT"
)]),
option: ColumnOption::AutoIncrement(None),
},
],
}],
Expand Down Expand Up @@ -770,9 +767,7 @@ fn parse_create_table_primary_and_unique_key() {
},
ColumnOptionDef {
name: None,
option: ColumnOption::DialectSpecific(vec![
Token::make_keyword("AUTO_INCREMENT")
]),
option: ColumnOption::AutoIncrement(None),
},
],
},
Expand Down
Loading