Skip to content

Add byte and short data types #8

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 1 commit into from
Dec 19, 2024
Merged

Add byte and short data types #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions src/ast/data_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ pub enum DataType {
///
/// [clickhouse]: https://clickhouse.com/docs/en/sql-reference/data-types/int-uint
Int256,
/// Byte with optional display width e.g. BYTE or BYTE(6)
Byte(Option<u64>),
/// Short with optional display width e.g. SHORT or SHORT(9)
Short(Option<u64>),
/// Integer with optional display width e.g. INTEGER or INTEGER(11)
Integer(Option<u64>),
/// Long with optional display width e.g. LONG or LONG(20)
Expand All @@ -204,6 +208,10 @@ pub enum DataType {
UnsignedInt(Option<u64>),
/// Unsigned int4 with optional display width e.g. INT4 UNSIGNED or INT4(11) UNSIGNED
UnsignedInt4(Option<u64>),
/// Unsigned byte with optional display width e.g. BYTE UNSIGNED or BYTE(6) UNSIGNED
UnsignedByte(Option<u64>),
/// Unsigned short with optional display width e.g. SHORT UNSIGNED or SHORT(9) UNSIGNED
UnsignedShort(Option<u64>),
/// Unsigned integer with optional display width e.g. INTEGER UNSIGNED or INTEGER(11) UNSIGNED
UnsignedInteger(Option<u64>),
/// Unsigned long with optional display width e.g. LONG UNSIGNED or LONG(20) UNSIGNED
Expand Down Expand Up @@ -483,6 +491,18 @@ impl fmt::Display for DataType {
DataType::UnsignedInt4(zerofill) => {
format_type_with_optional_length(f, "INT4", zerofill, true)
}
DataType::Byte(zerofill) => {
format_type_with_optional_length(f, "BYTE", zerofill, false)
}
DataType::UnsignedByte(zerofill) => {
format_type_with_optional_length(f, "BYTE", zerofill, true)
}
DataType::Short(zerofill) => {
format_type_with_optional_length(f, "SHORT", zerofill, false)
}
DataType::UnsignedShort(zerofill) => {
format_type_with_optional_length(f, "SHORT", zerofill, true)
}
DataType::Integer(zerofill) => {
format_type_with_optional_length(f, "INTEGER", zerofill, false)
}
Expand Down
2 changes: 2 additions & 0 deletions src/keywords.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ define_keywords!(
BUCKETS,
BY,
BYPASSRLS,
BYTE,
BYTEA,
BYTES,
CACHE,
Expand Down Expand Up @@ -717,6 +718,7 @@ define_keywords!(
SETS,
SETTINGS,
SHARE,
SHORT,
SHOW,
SIMILAR,
SKIP,
Expand Down
16 changes: 16 additions & 0 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8272,6 +8272,22 @@ impl<'a> Parser<'a> {
Keyword::INT64 => Ok(DataType::Int64),
Keyword::INT128 => Ok(DataType::Int128),
Keyword::INT256 => Ok(DataType::Int256),
Keyword::BYTE => {
let optional_precision = self.parse_optional_precision();
if self.parse_keyword(Keyword::UNSIGNED) {
Ok(DataType::UnsignedByte(optional_precision?))
} else {
Ok(DataType::Byte(optional_precision?))
}
}
Keyword::SHORT => {
let optional_precision = self.parse_optional_precision();
if self.parse_keyword(Keyword::UNSIGNED) {
Ok(DataType::UnsignedShort(optional_precision?))
} else {
Ok(DataType::Short(optional_precision?))
}
}
Keyword::INTEGER => {
let optional_precision = self.parse_optional_precision();
if self.parse_keyword(Keyword::UNSIGNED) {
Expand Down
58 changes: 58 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2405,6 +2405,54 @@ fn parse_cast() {
expr_from_projection(only(&select.projection))
);

let sql = "SELECT CAST(id AS BYTE) FROM customer";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Cast {
kind: CastKind::Cast,
expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Byte(None),
format: None,
},
expr_from_projection(only(&select.projection))
);

let sql = "SELECT CAST(id AS BYTE(6)) FROM customer";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Cast {
kind: CastKind::Cast,
expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Byte(Some(6)),
format: None,
},
expr_from_projection(only(&select.projection))
);

let sql = "SELECT CAST(id AS SHORT) FROM customer";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Cast {
kind: CastKind::Cast,
expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Short(None),
format: None,
},
expr_from_projection(only(&select.projection))
);

let sql = "SELECT CAST(id AS SHORT(9)) FROM customer";
let select = verified_only_select(sql);
assert_eq!(
&Expr::Cast {
kind: CastKind::Cast,
expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Short(Some(9)),
format: None,
},
expr_from_projection(only(&select.projection))
);

let sql = "SELECT CAST(id AS LONG) FROM customer";
let select = verified_only_select(sql);
assert_eq!(
Expand Down Expand Up @@ -2439,6 +2487,16 @@ fn parse_cast() {
"SELECT CAST(id AS BIGINT) FROM customer",
);

one_statement_parses_to(
"SELECT CAST(id AS BYTE(6) UNSIGNED) FROM customer",
"SELECT CAST(id AS BYTE(6) UNSIGNED) FROM customer",
);

one_statement_parses_to(
"SELECT CAST(id AS SHORT(9) UNSIGNED) FROM customer",
"SELECT CAST(id AS SHORT(9) UNSIGNED) FROM customer",
);

one_statement_parses_to(
"SELECT CAST(id AS LONG(20) UNSIGNED) FROM customer",
"SELECT CAST(id AS LONG(20) UNSIGNED) FROM customer",
Expand Down
Loading