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

added jsonb_insert #4257

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added jsonb_insert #4257

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
97 changes: 97 additions & 0 deletions diesel/src/pg/expression/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2078,3 +2078,100 @@ define_sql_function! {

fn jsonb_array_length<E: JsonbOrNullableJsonb + MaybeNullableValue<Integer>>(jsonb: E) -> E::Out;
}

#[cfg(feature = "postgres_backend")]
define_sql_function! {
/// Returns target with new_value inserted, if the item designated by the path is an array element.
///
/// # Example
///
/// ```rust
/// # include!("../../doctest_setup.rs");
/// #
/// # fn main() {
/// # run_test().unwrap();
/// # }
/// #
/// # fn run_test() -> QueryResult<()> {
/// # use diesel::dsl::jsonb_insert;
/// # use diesel::sql_types::{Array, Jsonb, Nullable, Text};
/// # use serde_json::{Value, json};
/// # let connection = &mut establish_connection();
/// let result = diesel::select(jsonb_insert::<Jsonb, Array<Text>, _, _, _>(json!([1, 2, 3]), vec!["2"], json!(1)))
/// .get_result::<Value>(connection)?;
/// assert_eq!(json!([1, 2, 1, 3]), result);
///
/// let result = diesel::select(jsonb_insert::<Jsonb, Array<Text>, _, _, _>(json!([1, 2, 3]), Vec::<String>::new(), json!(1)))
/// .get_result::<Value>(connection)?;
/// assert_eq!(json!([1, 2, 3]), result);
///
/// let result = diesel::select(jsonb_insert::<Nullable<Jsonb>, Array<Text>, _, _, _>(Option::<Value>::None, vec!["1"], json!(1)))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
/// let result = diesel::select(jsonb_insert::<Jsonb, Nullable<Array<Text>>, _, _, _>(json!([1, 2, 3]), None::<Vec<String>>, json!(1)))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
/// let result = diesel::select(jsonb_insert::<Nullable<Jsonb>, Array<Text>, _, _, _>(json!([1, 2, 3]), vec!["1"], Option::<Value>::None))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
///
/// # Ok(())
/// # }
/// ```
fn jsonb_insert<J: JsonbOrNullableJsonb + SingleValue, P: TextArrayOrNullableTextArray + CombinedNullableValue<J, Jsonb>>(target: J, path: P, value: J) -> P::Out;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to have separate generic types for the first and last argument here to allow using different types in these places. That allows us to use a column in one place and an expression in another place while calling this function. That means we won't be able to use CombineNullableValue as it is, we might need another helper trait there or some more experimentation how to combine three or four values with the existing trait.

}

#[cfg(feature = "postgres_backend")]
define_sql_function! {
/// Returns target with new_value inserted, if the item designated by the path is an array element.
/// If insert_after is true, the value is inserted after the path specified
///
///
/// # Example
///
/// ```rust
/// # include!("../../doctest_setup.rs");
/// #
/// # fn main() {
/// # run_test().unwrap();
/// # }
/// #
/// # fn run_test() -> QueryResult<()> {
/// # use diesel::dsl::jsonb_insert_with_option_after;
/// # use diesel::sql_types::{Array, Jsonb, Nullable, Text};
/// # use serde_json::{Value, json};
/// # let connection = &mut establish_connection();
/// let result = diesel::select(jsonb_insert_with_option_after::<Jsonb, Array<Text>, _, _, _, _>(json!([1, 2, 3]), vec!["2"], json!(1), true))
/// .get_result::<Value>(connection)?;
/// assert_eq!(json!([1, 2, 3, 1]), result);
///
/// let result = diesel::select(jsonb_insert_with_option_after::<Jsonb, Array<Text>, _, _, _, _>(json!([1, 2, 3]), vec!["2"], json!(1), false))
/// .get_result::<Value>(connection)?;
/// assert_eq!(json!([1, 2, 1, 3]), result);
///
/// let result = diesel::select(jsonb_insert_with_option_after::<Jsonb, Array<Text>, _, _, _, _>(json!([1, 2, 3]), Vec::<String>::new(), json!(1), true))
/// .get_result::<Value>(connection)?;
/// assert_eq!(json!([1, 2, 3]), result);
///
/// let result = diesel::select(jsonb_insert_with_option_after::<Nullable<Jsonb>, Array<Text>, _, _, _, _>(Option::<Value>::None, vec!["1"], json!(1), true))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
/// let result = diesel::select(jsonb_insert_with_option_after::<Jsonb, Nullable<Array<Text>>, _, _, _, _>(json!([1, 2, 3]), None::<Vec<String>>, json!(1), true))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
/// let result = diesel::select(jsonb_insert_with_option_after::<Nullable<Jsonb>, Array<Text>, _, _, _, _>(json!([1, 2, 3]), vec!["1"], Option::<Value>::None, true))
/// .get_result::<Option<Value>>(connection)?;
/// assert_eq!(None, result);
///
///
/// # Ok(())
/// # }
/// ```
#[sql_name = "jsonb_insert"]
fn jsonb_insert_with_option_after<J: JsonbOrNullableJsonb + SingleValue, P: TextArrayOrNullableTextArray + CombinedNullableValue<J, Jsonb>>(target: J, path: P, value: J, insert_after: Bool) -> P::Out;
}
12 changes: 12 additions & 0 deletions diesel/src/pg/expression/helper_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,3 +527,15 @@ pub type json_array_length<E> = super::functions::json_array_length<SqlTypeOf<E>
#[allow(non_camel_case_types)]
#[cfg(feature = "postgres_backend")]
pub type jsonb_array_length<E> = super::functions::jsonb_array_length<SqlTypeOf<E>, E>;

/// Return type of [`jsonb_insert(target, path, value)`](super::functions::jsonb_insert())
#[allow(non_camel_case_types)]
#[cfg(feature = "postgres_backend")]
pub type jsonb_insert<T, P, V> =
super::functions::jsonb_insert<SqlTypeOf<T>, SqlTypeOf<P>, T, P, V>;

/// Return type of [`jsonb_insert(target, path, value, insert_after)`](super::functions::jsonb_insert_with_option_after())
#[allow(non_camel_case_types)]
#[cfg(feature = "postgres_backend")]
pub type jsonb_insert_with_option_after<T, P, V, I> =
super::functions::jsonb_insert_with_option_after<SqlTypeOf<T>, SqlTypeOf<P>, T, P, V, I>;
8 changes: 8 additions & 0 deletions diesel_derives/tests/auto_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ table! {
table! {
pg_extras(id) {
id -> Integer,
boolean -> Bool,
json -> Json,
jsonb -> Jsonb,
net -> Inet,
Expand Down Expand Up @@ -446,6 +447,13 @@ fn postgres_functions() -> _ {
jsonb_strip_nulls(pg_extras::jsonb),
json_array_length(pg_extras::json),
jsonb_array_length(pg_extras::jsonb),
jsonb_insert(pg_extras::jsonb, pg_extras::text_array, pg_extras::jsonb),
jsonb_insert_with_option_after(
pg_extras::jsonb,
pg_extras::text_array,
pg_extras::jsonb,
pg_extras::boolean,
),
)
}

Expand Down
Loading