Skip to content

Commit

Permalink
Remove RawString variant on arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@miguelff
miguelff committed Nov 7, 2023
1 parent 687b72e commit 18ad27d
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 63 deletions.
2 changes: 0 additions & 2 deletions query-engine/driver-adapters/src/conversion.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use serde_json::value::Value as JsonValue;
#[derive(Debug, PartialEq, Serialize)]
#[serde(untagged)]
pub enum JSArg {
RawString(String),
Value(serde_json::Value),
Buffer(Vec<u8>),
Array(Vec<JSArg>),
Expand All @@ -35,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 Down
29 changes: 14 additions & 15 deletions query-engine/driver-adapters/src/conversion/mysql.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ 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::RawString(bd.to_string()),
quaint::ValueType::Json(Some(ref s)) => JSArg::RawString(serde_json::to_string(s)?),
quaint::ValueType::Numeric(Some(bd)) => JSArg::Value(JsonValue::String(bd.to_string())),
quaint::ValueType::Json(Some(s)) => JSArg::Value(s.to_owned()),
quaint::ValueType::Bytes(Some(bytes)) => JSArg::Buffer(bytes.to_vec()),
quaint::ValueType::Date(Some(d)) => JSArg::RawString(d.format(DATE_FORMAT).to_string()),
quaint::ValueType::DateTime(Some(dt)) => JSArg::RawString(dt.format(DATETIME_FORMAT).to_string()),
quaint::ValueType::Time(Some(t)) => JSArg::RawString(t.format(TIME_FORMAT).to_string()),
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()
Expand All @@ -38,43 +39,43 @@ mod test {
let test_cases = vec![
(
ValueType::Numeric(Some(1.into())),
JSArg::RawString("1".to_string())
JSArg::Value(JsonValue::String("1".to_string()))
),
(
ValueType::Numeric(Some(BigDecimal::from_str("-1.1").unwrap())),
JSArg::RawString("-1.1".to_string()),
JSArg::Value(JsonValue::String("-1.1".to_string()))
),
(
ValueType::Numeric(None),
JSArg::Value(serde_json::Value::Null)
),
(
ValueType::Json(Some(serde_json::json!({"a": 1}))),
JSArg::RawString(r#"{"a":1}"#.to_string()),
JSArg::Value(serde_json::json!({"a": 1}))
),
(
ValueType::Json(None),
JSArg::Value(serde_json::Value::Null)
),
(
ValueType::Date(Some(NaiveDate::from_ymd_opt(2020, 2, 29).unwrap())),
JSArg::RawString("2020-02-29".to_string()),
JSArg::Value(JsonValue::String("2020-02-29".to_string()))
),
(
ValueType::Date(None),
JSArg::Value(serde_json::Value::Null)
),
(
ValueType::DateTime(Some(Utc.with_ymd_and_hms(2020, 1, 1, 23, 13, 1).unwrap())),
JSArg::RawString("2020-01-01 23:13:01".to_string()),
JSArg::Value(JsonValue::String("2020-01-01 23:13:01".to_string()))
),
(
ValueType::DateTime(None),
JSArg::Value(serde_json::Value::Null)
),
(
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())),
JSArg::RawString("23:13:01".to_string()),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::Time(None),
Expand All @@ -85,13 +86,11 @@ mod test {
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(),
))),
JSArg::Array(vec!(
JSArg::RawString("1".to_string()),
JSArg::Value(serde_json::Value::Null),
JSArg::RawString("23:13:01".to_string()),
JSArg::Value(JsonValue::String("1".to_string())),
JSArg::Value(serde_json::Value::Null),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
))
),
];
Expand Down
58 changes: 17 additions & 41 deletions query-engine/driver-adapters/src/conversion/postgres.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,16 @@ 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::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::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(s.to_owned()),
(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()
Expand Down Expand Up @@ -66,51 +42,51 @@ mod test {
let test_cases: Vec<(quaint::Value, JSArg)> = vec![
(
ValueType::Numeric(Some(1.into())).into_value(),
JSArg::RawString("1".to_string())
JSArg::Value(JsonValue::String("1".to_string()))
),
(
ValueType::Numeric(Some(BigDecimal::from_str("-1.1").unwrap())).into_value(),
JSArg::RawString("-1.1".to_string()),
JSArg::Value(JsonValue::String("-1.1".to_string()))
),
(
ValueType::Numeric(None).into_value(),
JSArg::Value(Value::Null)
),
(
ValueType::Json(Some(serde_json::json!({"a": 1}))).into_value(),
JSArg::RawString(r#"{"a":1}"#.to_string()),
JSArg::Value(serde_json::json!({"a": 1}))
),
(
ValueType::Json(None).into_value(),
JSArg::Value(Value::Null)
),
(
ValueType::Date(Some(NaiveDate::from_ymd_opt(2020, 2, 29).unwrap())).into_value(),
JSArg::Value(Value::String("2020-02-29".to_string())),
JSArg::Value(Value::String("2020-02-29".to_string()))
),
(
ValueType::Date(None).into_value(),
JSArg::Value(Value::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::RawString("2020-01-01".to_string()),
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::RawString("23:13:01".to_string()),
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::RawString("23:13:01".to_string()),
JSArg::Value(JsonValue::String("23:13:01".to_string()))
),
(
ValueType::DateTime(None).into_value(),
JSArg::Value(Value::Null)
),
(
ValueType::Time(Some(NaiveTime::from_hms_opt(23, 13, 1).unwrap())).into_value(),
JSArg::Value(Value::String("23:13:01".to_string())),
JSArg::Value(Value::String("23:13:01".to_string()))
),
(
ValueType::Time(None).into_value(),
Expand All @@ -124,7 +100,7 @@ mod test {
ValueType::Time(None).into_value(),
))).into_value(),
JSArg::Array(vec!(
JSArg::RawString("1".to_string()),
JSArg::Value(JsonValue::String("1".to_string())),
JSArg::Value(Value::Null),
JSArg::Value(Value::String("23:13:01".to_string())),
JSArg::Value(Value::Null),
Expand Down
8 changes: 3 additions & 5 deletions query-engine/driver-adapters/src/conversion/sqlite.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ pub fn value_to_js_arg(value: &quaint::Value) -> serde_json::Result<JSArg> {
Ok(double) => JSArg::from(JsonValue::from(double)),
Err(_) => JSArg::from(JsonValue::from(value.clone())),
},
quaint::ValueType::Json(Some(ref s)) => {
let json_str = serde_json::to_string(s)?;
JSArg::RawString(json_str)
}
quaint::ValueType::Json(Some(s)) => JSArg::Value(s.to_owned()),
quaint::ValueType::Bytes(Some(bytes)) => JSArg::Buffer(bytes.to_vec()),
quaint::ValueType::Array(Some(ref items)) => JSArg::Array(
items
Expand Down Expand Up @@ -39,6 +36,7 @@ mod test {
fn test_value_to_js_arg() {
let test_cases = vec![
(
// This is different than how mysql or postgres processes integral BigInt values.
ValueType::Numeric(Some(1.into())),
JSArg::Value(Value::Number("1.0".parse().unwrap()))
),
Expand All @@ -52,7 +50,7 @@ mod test {
),
(
ValueType::Json(Some(serde_json::json!({"a": 1}))),
JSArg::RawString(r#"{"a":1}"#.to_string()),
JSArg::Value(serde_json::json!({"a": 1})),
),
(
ValueType::Json(None),
Expand Down

0 comments on commit 18ad27d

Please sign in to comment.