Skip to content

Commit

Permalink
Fix DATE / TIME argument parsing for planetscale (Rust side) (#4422)
Browse files Browse the repository at this point in the history 
* Fix serialization of date arguments for Planetscale

* Accelerate builds temporarily

* Unit tests for conversions

* Remove RawString variant on arguments

* Plain old string objects for json, without requiring RawString

* Revert "Accelerate builds temporarily"

This reverts commit 6c17fc7.
  • Loading branch information
Miguel Fernández authored Nov 7, 2023
1 parent b855cf2 commit e62f312
Show file tree
Hide file tree
Showing 5 changed files with 322 additions and 68 deletions.
34 changes: 2 additions & 32 deletions query-engine/driver-adapters/src/conversion.rs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pub(crate) mod mysql;
pub(crate) mod postgres;
pub(crate) mod sqlite;

Expand All @@ -6,10 +7,9 @@ use napi::NapiValue;
use serde::Serialize;
use serde_json::value::Value as JsonValue;

#[derive(Debug, Serialize)]
#[derive(Debug, PartialEq, Serialize)]
#[serde(untagged)]
pub enum JSArg {
RawString(String),
Value(serde_json::Value),
Buffer(Vec<u8>),
Array(Vec<JSArg>),
Expand All @@ -34,7 +34,6 @@ impl FromNapiValue for JSArg {
impl ToNapiValue for JSArg {
unsafe fn to_napi_value(env: napi::sys::napi_env, value: Self) -> napi::Result<napi::sys::napi_value> {
match value {
JSArg::RawString(s) => ToNapiValue::to_napi_value(env, s),
JSArg::Value(v) => ToNapiValue::to_napi_value(env, v),
JSArg::Buffer(bytes) => {
ToNapiValue::to_napi_value(env, napi::Env::from_raw(env).create_buffer_with_data(bytes)?.into_raw())
Expand All @@ -59,32 +58,3 @@ impl ToNapiValue for JSArg {
}
}
}

pub fn value_to_js_arg(value: &quaint::Value) -> serde_json::Result<JSArg> {
let res = match &value.typed {
quaint::ValueType::Json(s) => match s {
Some(ref s) => {
let json_str = serde_json::to_string(s)?;
JSArg::RawString(json_str)
}
None => JsonValue::Null.into(),
},
quaint::ValueType::Bytes(bytes) => match bytes {
Some(bytes) => JSArg::Buffer(bytes.to_vec()),
None => JsonValue::Null.into(),
},
quaint::ValueType::Numeric(bd) => match bd {
// converting decimal to string to preserve the precision
Some(bd) => JSArg::RawString(bd.to_string()),
None => JsonValue::Null.into(),
},
quaint::ValueType::Array(Some(ref items)) => JSArg::Array(values_to_js_args(items)?),
quaint_value => JSArg::from(JsonValue::from(quaint_value.clone())),
};

Ok(res)
}

pub fn values_to_js_args(values: &[quaint::Value<'_>]) -> serde_json::Result<Vec<JSArg>> {
values.iter().map(value_to_js_arg).collect()
}
107 changes: 107 additions & 0 deletions query-engine/driver-adapters/src/conversion/mysql.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
use crate::conversion::JSArg;
use serde_json::value::Value as JsonValue;

const DATETIME_FORMAT: &str = "%Y-%m-%d %H:%M:%S";
const DATE_FORMAT: &str = "%Y-%m-%d";
const TIME_FORMAT: &str = "%H:%M:%S";

#[rustfmt::skip]
pub fn value_to_js_arg(value: &quaint::Value) -> serde_json::Result<JSArg> {
let res = match &value.typed {
quaint::ValueType::Numeric(Some(bd)) => JSArg::Value(JsonValue::String(bd.to_string())),
quaint::ValueType::Json(Some(s)) => JSArg::Value(JsonValue::String(serde_json::to_string(s)?)),
quaint::ValueType::Bytes(Some(bytes)) => JSArg::Buffer(bytes.to_vec()),
quaint::ValueType::Date(Some(d)) => JSArg::Value(JsonValue::String(d.format(DATE_FORMAT).to_string())),
quaint::ValueType::DateTime(Some(dt)) => JSArg::Value(JsonValue::String(dt.format(DATETIME_FORMAT).to_string())),
quaint::ValueType::Time(Some(t)) => JSArg::Value(JsonValue::String(t.format(TIME_FORMAT).to_string())),
quaint::ValueType::Array(Some(ref items)) => JSArg::Array(
items
.iter()
.map(value_to_js_arg)
.collect::<serde_json::Result<Vec<JSArg>>>()?,
),
quaint_value => JSArg::from(JsonValue::from(quaint_value.clone())),
};
Ok(res)
}

#[cfg(test)]
mod test {
use super::*;
use bigdecimal::BigDecimal;
use chrono::*;
use quaint::ValueType;
use std::str::FromStr;

#[test]
#[rustfmt::skip]
fn test_value_to_js_arg() {
let test_cases = vec![
(
ValueType::Numeric(Some(1.into())),
JSArg::Value(JsonValue::String("1".to_string()))
),
(
ValueType::Numeric(Some(BigDecimal::from_str("-1.1").unwrap())),
JSArg::Value(JsonValue::String("-1.1".to_string()))
),
(
ValueType::Numeric(None),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Json(Some(serde_json::json!({"a": 1}))),
JSArg::Value(JsonValue::String("{\"a\":1}".to_string()))
),
(
ValueType::Json(None),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Date(Some(NaiveDate::from_ymd_opt(2020, 2, 29).unwrap())),
JSArg::Value(JsonValue::String("2020-02-29".to_string()))
),
(
ValueType::Date(None),
JSArg::Value(JsonValue::Null)
),
(
ValueType::DateTime(Some(Utc.with_ymd_and_hms(2020, 1, 1, 23, 13, 1).unwrap())),
JSArg::Value(JsonValue::String("2020-01-01 23:13:01".to_string()))
),
(
ValueType::DateTime(None),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::Time(None),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Array(Some(vec!(
ValueType::Numeric(Some(1.into())).into_value(),
ValueType::Numeric(None).into_value(),
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())).into_value(),
))),
JSArg::Array(vec!(
JSArg::Value(JsonValue::String("1".to_string())),
JSArg::Value(JsonValue::Null),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
))
),
];

let mut errors: Vec<String> = vec![];
for (val, expected) in test_cases {
let actual = value_to_js_arg(&val.clone().into_value()).unwrap();
if actual != expected {
errors.push(format!("transforming: {:?}, expected: {:?}, actual: {:?}", &val, expected, actual));
}
}
assert_eq!(errors.len(), 0, "{}", errors.join("\n"));
}
}
124 changes: 104 additions & 20 deletions query-engine/driver-adapters/src/conversion/postgres.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,115 @@ use serde_json::value::Value as JsonValue;

static TIME_FMT: Lazy<StrftimeItems> = Lazy::new(|| StrftimeItems::new("%H:%M:%S%.f"));

#[rustfmt::skip]
pub fn value_to_js_arg(value: &quaint::Value) -> serde_json::Result<JSArg> {
let res = match (&value.typed, value.native_column_type_name()) {
(quaint::ValueType::DateTime(value), Some("DATE")) => match value {
Some(value) => JSArg::RawString(value.date_naive().to_string()),
None => JsonValue::Null.into(),
},
(quaint::ValueType::DateTime(value), Some("TIME")) => match value {
Some(value) => JSArg::RawString(value.time().to_string()),
None => JsonValue::Null.into(),
},
(quaint::ValueType::DateTime(value), Some("TIMETZ")) => match value {
Some(value) => JSArg::RawString(value.time().format_with_items(TIME_FMT.clone()).to_string()),
None => JsonValue::Null.into(),
},
(quaint::ValueType::DateTime(value), _) => match value {
Some(value) => JSArg::RawString(value.naive_utc().to_string()),
None => JsonValue::Null.into(),
},
(quaint::ValueType::Array(Some(items)), _) => JSArg::Array(values_to_js_args(items)?),
_ => super::value_to_js_arg(value)?,
(quaint::ValueType::DateTime(Some(dt)), Some("DATE")) => JSArg::Value(JsonValue::String(dt.date_naive().to_string())),
(quaint::ValueType::DateTime(Some(dt)), Some("TIME")) => JSArg::Value(JsonValue::String(dt.time().to_string())),
(quaint::ValueType::DateTime(Some(dt)), Some("TIMETZ")) => JSArg::Value(JsonValue::String(dt.time().format_with_items(TIME_FMT.clone()).to_string())),
(quaint::ValueType::DateTime(Some(dt)), _) => JSArg::Value(JsonValue::String(dt.naive_utc().to_string())),
(quaint::ValueType::Json(Some(s)), _) => JSArg::Value(JsonValue::String(serde_json::to_string(s)?)),
(quaint::ValueType::Bytes(Some(bytes)), _) => JSArg::Buffer(bytes.to_vec()),
(quaint::ValueType::Numeric(Some(bd)), _) => JSArg::Value(JsonValue::String(bd.to_string())),
(quaint::ValueType::Array(Some(items)), _) => JSArg::Array(
items
.iter()
.map(value_to_js_arg)
.collect::<serde_json::Result<Vec<JSArg>>>()?,
),
(quaint_value, _) => JSArg::from(JsonValue::from(quaint_value.clone())),
};

Ok(res)
}

pub fn values_to_js_args(values: &[quaint::Value<'_>]) -> serde_json::Result<Vec<JSArg>> {
values.iter().map(value_to_js_arg).collect()
#[cfg(test)]
mod test {
use super::*;
use bigdecimal::BigDecimal;
use chrono::*;
use quaint::ValueType;
use std::str::FromStr;

#[test]
#[rustfmt::skip]
fn test_value_to_js_arg() {
let test_cases: Vec<(quaint::Value, JSArg)> = vec![
(
ValueType::Numeric(Some(1.into())).into_value(),
JSArg::Value(JsonValue::String("1".to_string()))
),
(
ValueType::Numeric(Some(BigDecimal::from_str("-1.1").unwrap())).into_value(),
JSArg::Value(JsonValue::String("-1.1".to_string()))
),
(
ValueType::Numeric(None).into_value(),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Json(Some(serde_json::json!({"a": 1}))).into_value(),
JSArg::Value(JsonValue::String("{\"a\":1}".to_string()))
),
(
ValueType::Json(None).into_value(),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Date(Some(NaiveDate::from_ymd_opt(2020, 2, 29).unwrap())).into_value(),
JSArg::Value(JsonValue::String("2020-02-29".to_string()))
),
(
ValueType::Date(None).into_value(),
JSArg::Value(JsonValue::Null)
),
(
ValueType::DateTime(Some(Utc.with_ymd_and_hms(2020, 1, 1, 23, 13, 1).unwrap())).into_value().with_native_column_type(Some("DATE")),
JSArg::Value(JsonValue::String("2020-01-01".to_string()))
),
(
ValueType::DateTime(Some(Utc.with_ymd_and_hms(2020, 1, 1, 23, 13, 1).unwrap())).into_value().with_native_column_type(Some("TIME")),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::DateTime(Some(Utc.with_ymd_and_hms(2020, 1, 1, 23, 13, 1).unwrap())).into_value().with_native_column_type(Some("TIMETZ")),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::DateTime(None).into_value(),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())).into_value(),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::Time(None).into_value(),
JSArg::Value(JsonValue::Null)
),
(
ValueType::Array(Some(vec!(
ValueType::Numeric(Some(1.into())).into_value(),
ValueType::Numeric(None).into_value(),
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())).into_value(),
ValueType::Time(None).into_value(),
))).into_value(),
JSArg::Array(vec!(
JSArg::Value(JsonValue::String("1".to_string())),
JSArg::Value(JsonValue::Null),
JSArg::Value(JsonValue::String("23:13:01".to_string())),
JSArg::Value(JsonValue::Null),
))
),
];

let mut errors: Vec<String> = vec![];
for (val, expected) in test_cases {
let actual = value_to_js_arg(&val).unwrap();
if actual != expected {
errors.push(format!("transforming: {:?}, expected: {:?}, actual: {:?}", &val, expected, actual));
}
}
assert_eq!(errors.len(), 0, "{}", errors.join("\n"));
}
}
Loading

0 comments on commit e62f312

Please sign in to comment.