Skip to content

fix(cubesql): convert properly DataType::Timestamp into ColumnType::Timestamp #9031

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 2 commits into from
Dec 11, 2024
Merged

fix(cubesql): convert properly DataType::Timestamp into ColumnType::Timestamp #9031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b702a11
fix(cubesql): convert properly DataType::Timestamp into ColumnType::T…
max-kammerer Dec 10, 2024
dd12784
chore: fix test
ovr Dec 10, 2024
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
2 changes: 1 addition & 1 deletion packages/cubejs-testing/test/smoke-cubesql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe('SQL API', () => {
expect(JSON.parse(chunk.toString()).schema).toEqual([
{
name: 'orderDate',
column_type: 'String',
column_type: 'Timestamp',
},
]);
} else {
Expand Down
39 changes: 38 additions & 1 deletion rust/cubesql/cubesql/src/sql/dataframe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ pub fn arrow_to_column_type(arrow_type: DataType) -> Result<ColumnType, CubeErro
DataType::Utf8 | DataType::LargeUtf8 => Ok(ColumnType::String),
DataType::Date32 => Ok(ColumnType::Date(false)),
DataType::Date64 => Ok(ColumnType::Date(true)),
DataType::Timestamp(_, _) => Ok(ColumnType::String),
DataType::Timestamp(_, _) => Ok(ColumnType::Timestamp),
DataType::Interval(unit) => Ok(ColumnType::Interval(unit)),
DataType::Float16 | DataType::Float32 | DataType::Float64 => Ok(ColumnType::Double),
DataType::Boolean => Ok(ColumnType::Boolean),
Expand Down Expand Up @@ -794,4 +794,41 @@ mod tests {
serde_json::to_string(&frame.data).unwrap()
);
}

#[test]
fn test_arrow_to_column_type() {
let cases = vec![
(DataType::Binary, ColumnType::Blob),
(DataType::Utf8, ColumnType::String),
(DataType::LargeUtf8, ColumnType::String),
(DataType::Date32, ColumnType::Date(false)),
(DataType::Date64, ColumnType::Date(true)),
(
DataType::Timestamp(TimeUnit::Second, None),
ColumnType::Timestamp,
),
(
DataType::Interval(IntervalUnit::YearMonth),
ColumnType::Interval(IntervalUnit::YearMonth),
),
(DataType::Float16, ColumnType::Double),
(DataType::Float32, ColumnType::Double),
(DataType::Float64, ColumnType::Double),
(DataType::Boolean, ColumnType::Boolean),
(DataType::Int32, ColumnType::Int32),
(DataType::UInt32, ColumnType::Int32),
(DataType::Int8, ColumnType::Int64),
(DataType::Int16, ColumnType::Int64),
(DataType::Int64, ColumnType::Int64),
(DataType::UInt8, ColumnType::Int64),
(DataType::UInt16, ColumnType::Int64),
(DataType::UInt64, ColumnType::Int64),
(DataType::Null, ColumnType::String),
];

for (arrow_type, expected_column_type) in cases {
let result = arrow_to_column_type(arrow_type.clone()).unwrap();
assert_eq!(result, expected_column_type, "Failed for {:?}", arrow_type);
}
}
}
Loading