Skip to content

UUID, Array(T) and DateTime64 types support #1

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

Open
narkq wants to merge 4 commits into
base: master
Choose a base branch
from
Open

UUID, Array(T) and DateTime64 types support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82bcb44
UUID, Array(T) and DateTime64 types support
narkq Feb 14, 2022
87e086a
Allow `Array(Nullable(T))` and `Array(LowCardinality(T))`
narkq Feb 15, 2022
23b8803
Add helper methods for convenient constructing SqlType and SqlTypeOpt…
narkq Feb 15, 2022
bca990a
Support for Array(t) default values
narkq Feb 16, 2022
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
106 changes: 106 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ use column::Column;
use create::{
CreateTableStatement,
creation,
field_specification_opts,
};

fn eof<I: Copy + InputLength, E: ParseError<I>>(input: I) -> IResult<I, I, E> {
Expand Down Expand Up @@ -185,11 +186,14 @@ pub enum SqlType {
Enum(Option<TypeSize16>, Vec<(String, i16)>),
Date,
DateTime(Option<String>),
DateTime64(u8, Option<String>),
Float32,
Float64,
FixedString(usize),
IPv4,
IPv6,
UUID,
Array(Box<SqlTypeOpts>),
}

impl fmt::Display for SqlType {
Expand All @@ -209,15 +213,29 @@ impl fmt::Display for SqlType {
SqlType::Date => write!(f, "Date"),
SqlType::DateTime(None) => write!(f, "DateTime"),
SqlType::DateTime(Some(timezone)) => write!(f, "DateTime({})", timezone),
SqlType::DateTime64(precision, None) => write!(f, "DateTime64({})", precision),
SqlType::DateTime64(precision, Some(timezone)) => write!(f, "DateTime64({}, {})", precision, timezone),
SqlType::Float32 => write!(f, "Float32"),
SqlType::Float64 => write!(f, "Float64"),
SqlType::FixedString(size) => write!(f, "FixedString({})", size),
SqlType::IPv4 => write!(f, "IPv4"),
SqlType::IPv6 => write!(f, "IPv6"),
SqlType::UUID => write!(f, "UUID"),
SqlType::Array(t) => write!(f, "Array({})", t),
}
}
}

impl SqlType {
pub fn array_from_sql_type(t: SqlType) -> SqlType {
SqlType::array_from_sql_type_opts(SqlTypeOpts::from_sql_type(t))
}

pub fn array_from_sql_type_opts(t: SqlTypeOpts) -> SqlType {
SqlType::Array(Box::new(t))
}
}

#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub struct SqlTypeOpts {
pub ftype: SqlType,
Expand All @@ -236,6 +254,27 @@ impl fmt::Display for SqlTypeOpts{
}
}

impl SqlTypeOpts {
pub fn from_sql_type(t: SqlType) -> SqlTypeOpts {
SqlTypeOpts {
ftype: t,
nullable: false,
lowcardinality: false,
}
}

pub fn nullable(&self) -> SqlTypeOpts {
let mut r = self.clone();
r.nullable = true;
r
}

pub fn low_carinality(&self) -> SqlTypeOpts {
let mut r = self.clone();
r.lowcardinality = true;
r
}
}

fn ttl_expression(i: &[u8]) -> IResult<&[u8], &[u8]> {
//date + INTERVAL 1 DAY
Expand Down Expand Up @@ -284,6 +323,7 @@ fn sql_expression(i: &[u8]) -> IResult<&[u8], &[u8]> {
sql_simple_expression,
))),
sql_simple_expression,
sql_array,
))(i)
}
fn sql_simple_expression(i: &[u8]) -> IResult<&[u8], &[u8]> {
Expand Down Expand Up @@ -312,6 +352,14 @@ fn sql_tuple(i: &[u8]) -> IResult<&[u8], &[u8]> {
)))(i)
}

fn sql_array(i: &[u8]) -> IResult<&[u8], &[u8]> {
recognize(tuple((
tag("["),
separated_list(ws_sep_comma, sql_expression),
tag("]"),
)))(i)
}

fn sql_cast_function(i: &[u8]) -> IResult<&[u8], &[u8]> {
recognize(tuple((
tag_no_case("CAST"),
Expand Down Expand Up @@ -434,6 +482,27 @@ fn type_identifier(i: &[u8]) -> IResult<&[u8], SqlType> {
map(tag_no_case("string"), |_| SqlType::String),
map(tag_no_case("float32"), |_| SqlType::Float32),
map(tag_no_case("float64"), |_| SqlType::Float64),
map(
tuple((
tag_no_case("datetime64"),
multispace0,
tag("("),
multispace0,
one_of("0123456789"),
multispace0,
opt(map(
tuple((
tag(","),
multispace0,
delimited(tag("'"), take_until("'"), tag("'")),
)),
|(_, _, timezone)| str::from_utf8(timezone).unwrap().to_string()
)),
multispace0,
tag(")"),
)),
|(_, _, _, _, precision, _, timezone, _, _)| SqlType::DateTime64(precision.to_digit(10).unwrap() as u8, timezone)
),
map(
tuple((
tag_no_case("datetime"),
Expand Down Expand Up @@ -461,6 +530,16 @@ fn type_identifier(i: &[u8]) -> IResult<&[u8], SqlType> {
),
map(tag_no_case("ipv4"), |_| SqlType::IPv4),
map(tag_no_case("ipv6"), |_| SqlType::IPv6),
map(tag_no_case("uuid"), |_| SqlType::UUID),
map(
tuple((
tag_no_case("array"),
tag("("),
field_specification_opts,
tag(")"),
)),
|(_,_,t,_)| SqlType::Array(Box::new(t))
),
))(i)
}

Expand Down Expand Up @@ -531,11 +610,30 @@ mod test {
( "Float32", SqlType::Float32 ),
( "Float64", SqlType::Float64 ),

( "DateTime64(9)", SqlType::DateTime64(9, None) ),
( "DateTime64( 3 ,'Etc/UTC' )", SqlType::DateTime64(3, Some("Etc/UTC".into())) ),

( "DateTime", SqlType::DateTime(None) ),
( "DateTime('Cont/City')", SqlType::DateTime(Some("Cont/City".into())) ),
( "DateTime ( 'Cont/City')", SqlType::DateTime(Some("Cont/City".into())) ),

( "FixedString(3)", SqlType::FixedString(3) ),

( "UUID", SqlType::UUID ),
( "Array(FixedString(2))", SqlType::array_from_sql_type(SqlType::FixedString(2)) ),
( "Array(Nullable(Int32))", SqlType::array_from_sql_type_opts(
SqlTypeOpts::from_sql_type(SqlType::Int(TypeSize::B32)).nullable()
) ),
( "Array(LowCardinality(String))", SqlType::array_from_sql_type_opts(
SqlTypeOpts::from_sql_type(SqlType::String).low_carinality()
) ),
( "Array(Array(Array(Int64)))", SqlType::array_from_sql_type(
SqlType::array_from_sql_type(
SqlType::array_from_sql_type(
SqlType::Int(TypeSize::B64),
),
),
) ),
];
parse_set_for_test(type_identifier, patterns);
}
Expand Down Expand Up @@ -563,6 +661,14 @@ mod test {
"assumeNotNull(if(length(deviceId) > 1, murmurHash3_64(deviceId), rand()))",
"assumeNotNull(if(length(deviceId) > 1, murmurHash3_64(deviceId), rand()))".to_string()
),
(
"[]",
"[]".to_string()
),
(
"[1, 2, 3]",
"[1, 2, 3]".to_string()
),
];
parse_set_for_test(|i| sql_expression(i)
.map(|(_, o)| ("".as_bytes(), str::from_utf8(o).unwrap().to_string())),
Expand Down
9 changes: 7 additions & 2 deletions tests/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,14 @@ fn parse_file(path: &str) -> (i32, i32) {
#[test]
fn tables() {
let (_ok, fail) = parse_file("tests/tables.sql");
let (_ok, fail) = parse_file("tests/tables2.sql");

assert_eq!(0, fail);
assert_eq!(0, fail);
}


#[test]
fn tables2() {
let (_ok, fail) = parse_file("tests/tables2.sql");

assert_eq!(0, fail);
}
13 changes: 13 additions & 0 deletions tests/tables2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,16 @@ CREATE TABLE default.api3_http_request (
`osVersion` LowCardinality(Nullable(String)),
`deviceId` Nullable(String)
) ENGINE = Distributed('nginx_cluster', '', 'api3_http_request', assumeNotNull(if(length(deviceId) > 1, murmurHash3_64(deviceId), rand())));

CREATE TABLE default.EventServerLoggerRequest
(
`uuid` UUID,
`searchId` Nullable(UUID),
`eventId` String,
`ip` UInt32,
`drivingLicence` Array(String),
`keywordIds` Array(UInt32) DEFAULT [] CODEC(T64),
`created` DateTime64(3) CODEC(DoubleDelta),
`loaded` DateTime64(6, 'Europe/Moscow') CODEC(DoubleDelta)
)
ENGINE = Distributed('nginx_cluster', '', 'EventServerRtbLoggerRequest', rand());