Skip to content

refactor(bigquery)!: rename FromSql::from_sql to from_value #6624

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
alvarowolfx merged 2 commits into from
Sep 9, 2026
Merged

refactor(bigquery)!: rename FromSql::from_sql to from_value #6624

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
373cb77
refactor(bigquery)!: rename FromSql::from_sql to from_value
alvarowolfx Sep 1, 2026
d943dfe
Merge branch 'main' into impl-bq-rename-from-sql
alvarowolfx Sep 9, 2026
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
6 changes: 3 additions & 3 deletions src/bigquery-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub fn derive_from_sql(input: TokenStream) -> TokenStream {
quote! {
let #field_name = iter.next()
.ok_or_else(|| google_cloud_bigquery::error::ConvertError::MissingField(#db_column_name.to_string()))?;
let #field_name = google_cloud_bigquery::query::FromSql::from_sql(#field_name)?;
let #field_name = google_cloud_bigquery::query::FromSql::from_value(#field_name)?;
}
});

Expand All @@ -129,13 +129,13 @@ pub fn derive_from_sql(input: TokenStream) -> TokenStream {
quote! {
let #field_name = obj.remove(#db_column_name)
.ok_or_else(|| google_cloud_bigquery::error::ConvertError::MissingField(#db_column_name.to_string()))?;
let #field_name = google_cloud_bigquery::query::FromSql::from_sql(#field_name)?;
let #field_name = google_cloud_bigquery::query::FromSql::from_value(#field_name)?;
}
});

let expanded = quote! {
impl google_cloud_bigquery::query::FromSql for #name {
fn from_sql(value: wkt::Value) -> std::result::Result<Self, google_cloud_bigquery::error::ConvertError> {
fn from_value(value: wkt::Value) -> std::result::Result<Self, google_cloud_bigquery::error::ConvertError> {
match value {
wkt::Value::Array(arr) => {
let mut iter = arr.into_iter();
Expand Down
12 changes: 6 additions & 6 deletions src/bigquery/src/datatypes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub struct Interval {
}

impl FromSql for Interval {
fn from_sql(value: wkt::Value) -> Result<Self, ConvertError> {
fn from_value(value: wkt::Value) -> Result<Self, ConvertError> {
match value {
wkt::Value::String(s) => {
let mut parts = s.split_whitespace();
Expand Down Expand Up @@ -210,7 +210,7 @@ pub struct Range<T> {
}

impl<T: FromSql> FromSql for Range<T> {
fn from_sql(value: wkt::Value) -> Result<Self, ConvertError> {
fn from_value(value: wkt::Value) -> Result<Self, ConvertError> {
match value {
wkt::Value::String(s) => {
let trimmed = s.trim();
Expand Down Expand Up @@ -242,13 +242,13 @@ impl<T: FromSql> FromSql for Range<T> {
let start = if start_str.is_empty() || start_str == "UNBOUNDED" {
None
} else {
Some(T::from_sql(wkt::Value::String(start_str.to_string()))?)
Some(T::from_value(wkt::Value::String(start_str.to_string()))?)
};

let end = if end_str.is_empty() || end_str == "UNBOUNDED" {
None
} else {
Some(T::from_sql(wkt::Value::String(end_str.to_string()))?)
Some(T::from_value(wkt::Value::String(end_str.to_string()))?)
};

Ok(Range { start, end })
Expand Down Expand Up @@ -306,7 +306,7 @@ mod tests {
#[test_case(wkt::Value::String("1-2 3 4:05:06:07".to_string()) => Err(TestConvertError::Convert("invalid interval time format".to_string())) ; "too many time parts")]
#[test_case(wkt::Value::String("1-2 3 4:05:06.x".to_string()) => Err(TestConvertError::Convert("invalid digit found in string".to_string())) ; "invalid subsecond")]
fn test_from_sql_interval(value: wkt::Value) -> Result<Interval, TestConvertError> {
FromSql::from_sql(value).map_err(TestConvertError::from)
FromSql::from_value(value).map_err(TestConvertError::from)
}

#[test_case(wkt::Value::String("[2026-05-28, 2026-05-29)".to_string()) => Ok(Range { start: Some(google_cloud_type::model::Date::new().set_year(2026).set_month(5).set_day(28)), end: Some(google_cloud_type::model::Date::new().set_year(2026).set_month(5).set_day(29)) }) ; "date range bounded")]
Expand All @@ -324,6 +324,6 @@ mod tests {
fn test_from_sql_range(
value: wkt::Value,
) -> Result<Range<google_cloud_type::model::Date>, TestConvertError> {
FromSql::from_sql(value).map_err(TestConvertError::from)
FromSql::from_value(value).map_err(TestConvertError::from)
}
}
Loading
Loading