Skip to content
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

Jump to bottom

runtimes/js: support Buffer in db queries #1372

Merged
merged 1 commit into from
Sep 5, 2024
Merged

runtimes/js: support Buffer in db queries #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 runtimes/js/encore.dev/storage/sqldb/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const driverName = "node-pg";
export type Row = Record<string, any>;

/** Represents a type that can be used in query template literals */
export type Primitive = string | number | boolean | null;
export type Primitive = string | number | boolean | Buffer | null;

/**
* Constructing a new database object will result in Encore provisioning a database with
Expand Down
117 changes: 63 additions & 54 deletions runtimes/js/src/sqldb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,68 +22,77 @@ pub struct QueryArgs {
impl QueryArgs {
#[napi(constructor)]
pub fn new(env: Env, params: Vec<JsUnknown>) -> napi::Result<Self> {
use napi::ValueType;
let values: napi::Result<Vec<_>> = params
.into_iter()
.map(|val| -> napi::Result<sqldb::RowValue> {
Ok(match val.get_type()? {
ValueType::Null => sqldb::RowValue::Json(serde_json::Value::Null),
ValueType::Number => {
let float = val.coerce_to_number()?.get_double()?;
let int = float as i64;
if float == int as f64 {
sqldb::RowValue::Json(serde_json::Value::Number(int.into()))
} else {
match serde_json::Number::from_f64(float) {
Some(n) => sqldb::RowValue::Json(serde_json::Value::Number(n)),
None => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"failed to convert float to json number".to_string(),
));
}
let values = convert_row_values(env, params)?;
Ok(Self {
values: std::sync::Mutex::new(values),
})
}
}

fn convert_row_values(env: Env, params: Vec<JsUnknown>) -> napi::Result<Vec<sqldb::RowValue>> {
use napi::{JsBuffer, ValueType};
params
.into_iter()
.map(|val| -> napi::Result<sqldb::RowValue> {
Ok(match val.get_type()? {
ValueType::Null => sqldb::RowValue::Json(serde_json::Value::Null),
ValueType::Number => {
let float = val.coerce_to_number()?.get_double()?;
let int = float as i64;
if float == int as f64 {
sqldb::RowValue::Json(serde_json::Value::Number(int.into()))
} else {
match serde_json::Number::from_f64(float) {
Some(n) => sqldb::RowValue::Json(serde_json::Value::Number(n)),
None => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"failed to convert float to json number".to_string(),
));
}
}
}
ValueType::Boolean => {
let b = val.coerce_to_bool()?.get_value()?;
sqldb::RowValue::Json(serde_json::Value::Bool(b))
}
ValueType::String => {
let s = val.coerce_to_string()?.into_utf8()?.into_owned()?;
sqldb::RowValue::Json(serde_json::Value::String(s))
}
ValueType::Object => {
}
ValueType::Boolean => {
let b = val.coerce_to_bool()?.get_value()?;
sqldb::RowValue::Json(serde_json::Value::Bool(b))
}
ValueType::String => {
let s = val.coerce_to_string()?.into_utf8()?.into_owned()?;
sqldb::RowValue::Json(serde_json::Value::String(s))
}
ValueType::Object => {
// Is this a buffer?
if val.is_buffer()? {
let buf: JsBuffer = val.try_into()?;
let buf = buf.into_value()?;
sqldb::RowValue::Bytes(buf.to_vec())
} else {
let val: serde_json::Value = env.from_js_value(val)?;
sqldb::RowValue::Json(val)
}
ValueType::Unknown => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unknown not yet supported".to_string(),
));
}
ValueType::BigInt => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unsupported value type".to_string(),
));
}
_ => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unsupported value type".to_string(),
));
}
})
}
ValueType::Unknown => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unknown not yet supported".to_string(),
));
}
ValueType::BigInt => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unsupported value type".to_string(),
));
}
_ => {
return Err(napi::Error::new(
napi::Status::GenericFailure,
"unsupported value type".to_string(),
));
}
})
.collect();

let values = values?;
Ok(Self {
values: std::sync::Mutex::new(values),
})
}
.collect()
}

#[napi]
Expand Down
3 changes: 2 additions & 1 deletion tsparser/src/parser/resources/infra/sqldb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::path::{Path, PathBuf};

use anyhow::Context;
use anyhow::{anyhow, Result};
use litparser_derive::LitParser;
use once_cell::sync::Lazy;
Expand Down Expand Up @@ -128,7 +129,7 @@ fn parse_migrations(dir: &Path) -> Result<Vec<DBMigration>> {
static FILENAME_RE: Lazy<Regex> =
Lazy::new(|| Regex::new(r"^(\d+)_([^.]+)\.(up|down).sql$").unwrap());

let paths = std::fs::read_dir(dir)?;
let paths = std::fs::read_dir(dir).context("read database migration directory")?;
for entry in paths {
let entry = entry?;
if !entry.file_type()?.is_file() {
Expand Down
Loading