From caf95a51e1487ceddcbfb41bdaef90c4c2162b19 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 10 Dec 2024 20:01:38 +0100 Subject: [PATCH] revert --- rust/cubesql/cubesql/src/sql/dataframe.rs | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/rust/cubesql/cubesql/src/sql/dataframe.rs b/rust/cubesql/cubesql/src/sql/dataframe.rs index 3c0f856f13a2c..b5afcf8f556cd 100644 --- a/rust/cubesql/cubesql/src/sql/dataframe.rs +++ b/rust/cubesql/cubesql/src/sql/dataframe.rs @@ -404,7 +404,7 @@ pub fn arrow_to_column_type(arrow_type: DataType) -> Result Ok(ColumnType::String), DataType::Date32 => Ok(ColumnType::Date(false)), DataType::Date64 => Ok(ColumnType::Date(true)), - DataType::Timestamp(_, _) => Ok(ColumnType::Timestamp), + DataType::Timestamp(_, _) => Ok(ColumnType::String), DataType::Interval(unit) => Ok(ColumnType::Interval(unit)), DataType::Float16 | DataType::Float32 | DataType::Float64 => Ok(ColumnType::Double), DataType::Boolean => Ok(ColumnType::Boolean), @@ -826,7 +826,7 @@ mod tests { (DataType::Date64, ColumnType::Date(true)), ( DataType::Timestamp(TimeUnit::Second, None), - ColumnType::Timestamp, + ColumnType::String, ), ( DataType::Interval(IntervalUnit::YearMonth), @@ -895,41 +895,41 @@ mod tests { Ok(()) } - #[test] - fn test_timestamp_conversion() -> Result<(), CubeError> { - let data_nano = vec![Some(1640995200000000000)]; - create_record_batch( - DataType::Timestamp(TimeUnit::Nanosecond, None), - TimestampNanosecondArray::from(data_nano.clone()), - ColumnType::Timestamp, - data_nano - .into_iter() - .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap(), None))) - .collect::>(), - )?; - - let data_micro = vec![Some(1640995200000000)]; - create_record_batch( - DataType::Timestamp(TimeUnit::Microsecond, None), - TimestampMicrosecondArray::from(data_micro.clone()), - ColumnType::Timestamp, - data_micro - .into_iter() - .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap() * 1000, None))) - .collect::>(), - )?; - - let data_milli = vec![Some(1640995200000)]; - create_record_batch( - DataType::Timestamp(TimeUnit::Millisecond, None), - TimestampMillisecondArray::from(data_milli.clone()), - ColumnType::Timestamp, - data_milli - .into_iter() - .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap() * 1000000, None))) - .collect::>(), - ) - } + // #[test] + // fn test_timestamp_conversion() -> Result<(), CubeError> { + // let data_nano = vec![Some(1640995200000000000)]; + // create_record_batch( + // DataType::Timestamp(TimeUnit::Nanosecond, None), + // TimestampNanosecondArray::from(data_nano.clone()), + // ColumnType::Timestamp, + // data_nano + // .into_iter() + // .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap(), None))) + // .collect::>(), + // )?; + // + // let data_micro = vec![Some(1640995200000000)]; + // create_record_batch( + // DataType::Timestamp(TimeUnit::Microsecond, None), + // TimestampMicrosecondArray::from(data_micro.clone()), + // ColumnType::Timestamp, + // data_micro + // .into_iter() + // .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap() * 1000, None))) + // .collect::>(), + // )?; + // + // let data_milli = vec![Some(1640995200000)]; + // create_record_batch( + // DataType::Timestamp(TimeUnit::Millisecond, None), + // TimestampMillisecondArray::from(data_milli.clone()), + // ColumnType::Timestamp, + // data_milli + // .into_iter() + // .map(|e| TableValue::Timestamp(TimestampValue::new(e.unwrap() * 1000000, None))) + // .collect::>(), + // ) + // } #[test] fn test_signed_conversion() -> Result<(), CubeError> {