Merge branch 'master' into array_subselect

Author: weiznich

.github/ISSUE_TEMPLATE/config.yml

@@ -3,12 +3,9 @@ contact_links:
   - name: Compiler error while compiling diesel
     url: https://github.com/diesel-rs/diesel/issues?q=is%3Aissue+ld+returned+1+exit+status+
     about: Failed to compile diesel? Have a look at existing issues. You've likely miss some required dependency.
-  - name: Simple Questions
-    url: https://gitter.im/diesel-rs/diesel
-    about: If you have a simple question please use our gitter channel.
-  - name: Complex Questions
+  - name: Questions
     url: https://github.com/diesel-rs/diesel/discussions/categories/q-a
-    about: Do you have a larger question? Ask in our forum.
+    about: Do you have questions? Ask in our forum.
   - name: Feature Requests
     url: https://github.com/diesel-rs/diesel/discussions/categories/ideas
     about: If you want to suggest a new feature please create a new topic in our discussions forum

CHANGELOG.md

@@ -21,6 +21,7 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 * Added `diesel::r2d2::TestCustomizer`, which allows users to customize their `diesel::r2d2::Pool`s
 in a way that makes the pools suitable for use in parallel tests.
 * Added `Json` and `Jsonb` support for the SQLite backend.
+* Fixed diesel thinking `a.eq_any(b)` was non-nullable even if `a` and `b` were nullable.
 
 ## [2.2.2] 2024-07-19
 

CONTRIBUTING.md

@@ -3,8 +3,7 @@
 Thanks for your interest in contributing to Diesel! We very much look forward to
 your suggestions, bug reports, and pull requests.
 
-We run an active [Gitter
-channel](https://gitter.im/diesel-rs/diesel) where you can ask Diesel-related questions and
+We run an active [discussion forum](https://github.com/diesel-rs/diesel/discussions) where you can ask Diesel-related questions and
 get help. Feel free to ask there before opening a GitHub issue or
 pull request.
 

README.md

@@ -3,7 +3,6 @@
 # A safe, extensible ORM and Query Builder for Rust
 
 [![Build Status](https://github.com/diesel-rs/diesel/workflows/CI%20Tests/badge.svg)](https://github.com/diesel-rs/diesel/actions?query=workflow%3A%22CI+Tests%22+branch%3Amaster)
-[![Gitter](https://badges.gitter.im/diesel-rs/diesel.svg)](https://gitter.im/diesel-rs/diesel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crates.io](https://img.shields.io/crates/v/diesel.svg)](https://crates.io/crates/diesel)
 
 API Documentation: [latest release](https://docs.rs/diesel) – [master branch](https://docs.diesel.rs/master/diesel/index.html)
@@ -36,10 +35,8 @@ Guides on more specific features are coming soon.
 ## Getting help
 
 If you run into problems, Diesel has a very active Gitter room.
-You can come ask for help at
-[gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel).
-For help with longer questions and discussion about the future of Diesel,
-open a discussion on [GitHub Discussions](https://github.com/diesel-rs/diesel/discussions).
+You can come ask for help at in our [GitHub Discussions](https://github.com/diesel-rs/diesel/discussions) forum. 
+This is also the right place to propose new features or show your applications.
 
 ## Usage
 

diesel/src/lib.rs

@@ -369,6 +369,7 @@ pub mod helper_types {
     use super::query_dsl::methods::*;
     use super::query_dsl::*;
     use super::query_source::{aliasing, joins};
+    use crate::dsl::CountStar;
     use crate::query_builder::select_clause::SelectClause;
 
     #[doc(inline)]
@@ -699,6 +700,9 @@ pub mod helper_types {
     /// [`DeleteStatement::returning`](crate::query_builder::DeleteStatement::returning)
     pub type Returning<Q, S> =
         <Q as crate::query_builder::returning_clause::ReturningClauseHelper<S>>::WithReturning;
+
+    #[doc(hidden)] // used for `QueryDsl::count`
+    pub type Count<Q> = Select<Q, CountStar>;
 }
 
 pub mod prelude {

diesel/src/pg/expression/functions.rs

@@ -2398,3 +2398,86 @@ define_sql_function! {
         J: JsonbOrNullableJsonb + CombinedAllNullableValue<Jsonb, B>
     >(base: B, from_json: J) -> J::Out;
 }
+
+#[cfg(feature = "postgres_backend")]
+define_sql_function! {
+    /// Returns target with the item designated by path replaced by new_value,
+    ///     or with new_value added if create_if_missing is true (which is the default)
+    ///     and the item designated by path does not exist.
+    ///
+    /// It can't set path in scalar
+    ///
+    /// All earlier steps in the path must exist, or the target is returned unchanged.
+    /// As with the path oriented operators, negative integers that appear in the path count from the end of JSON arrays.
+    /// If the last path step is an array index that is out of range,
+    ///     and create_if_missing is true, the new value is added at the beginning of the array if the index is negative,
+    ///     or at the end of the array if it is positive.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// # include!("../../doctest_setup.rs");
+    /// #
+    /// # fn main() {
+    /// #     #[cfg(feature = "serde_json")]
+    /// #     run_test().unwrap();
+    /// # }
+    /// #
+    /// # #[cfg(feature = "serde_json")]
+    /// # fn run_test() -> QueryResult<()> {
+    /// #     use diesel::dsl::jsonb_set;
+    /// #     use diesel::sql_types::{Jsonb,Array, Json, Nullable, Text};
+    /// #     use serde_json::{json,Value};
+    /// #     let connection = &mut establish_connection();
+    ///
+    /// let result = diesel::select(jsonb_set::<Jsonb, Array<Text>, _, _, _>(
+    ///         json!([{"f1":1,"f2":null},2,null,3]),
+    ///         vec!["0","f1"],
+    ///         json!([2,3,4])
+    ///     )).get_result::<Value>(connection)?;
+    /// let expected: Value = json!([{"f1": [2, 3, 4], "f2": null}, 2, null, 3]);
+    /// assert_eq!(result, expected);
+    ///
+    /// let result = diesel::select(jsonb_set::<Jsonb, Array<Text>, _, _, _>(
+    ///         json!([{"odd":[2,4,6,8]}]),
+    ///         // not vec!["odd"], cannot set path in scalar
+    ///         vec!["0","odd"],
+    ///         json!([1,3,5,7])
+    ///     )).get_result::<Value>(connection)?;
+    /// let expected: Value = json!([{"odd":[1,3,5,7]}]);
+    /// assert_eq!(result, expected);
+    ///
+    /// let empty:Vec<String> = Vec::new();
+    /// let result = diesel::select(jsonb_set::<Nullable<Jsonb>, Array<Nullable<Text>>, _, _, _>(
+    ///         None::<Value>,
+    ///         empty,
+    ///         None::<Value>
+    ///     )).get_result::<Option<Value>>(connection)?;
+    /// assert!(result.is_none());
+    ///
+    /// let empty:Vec<String> = Vec::new();
+    /// let result = diesel::select(jsonb_set::<Jsonb, Array<Nullable<Text>>, _, _, _>(
+    ///         // cannot be json!(null)
+    ///         json!([]),
+    ///         empty,
+    ///         json!(null)
+    ///     )).get_result::<Value>(connection)?;
+    /// let expected = json!([]);
+    /// assert_eq!(result, expected);
+    ///
+    /// let result = diesel::select(jsonb_set::<Jsonb, Nullable<Array<Nullable<Text>>>, _, _, _,>(
+    ///         json!(null),
+    ///         None::<Vec<String>>,
+    ///         json!({"foo": 42})
+    ///     )).get_result::<Option<Value>>(connection)?;
+    /// assert!(result.is_none());
+    ///
+    ///
+    /// #     Ok(())
+    /// # }
+    /// ```
+    fn jsonb_set<
+        E: JsonbOrNullableJsonb + SingleValue,
+        Arr: TextArrayOrNullableTextArray + CombinedNullableValue<E,Jsonb>
+    >(base: E, path: Arr, new_value: E) -> Arr::Out;
+}

diesel/src/pg/expression/helper_types.rs

@@ -592,3 +592,8 @@ pub type json_populate_record<B, J> =
 #[cfg(feature = "postgres_backend")]
 pub type jsonb_populate_record<B, J> =
     super::functions::jsonb_populate_record<SqlTypeOf<B>, SqlTypeOf<J>, B, J>;
+
+/// Return type of [`jsonb_set(base, path, new_value)`](super::functions::jsonb_set())
+#[allow(non_camel_case_types)]
+#[cfg(feature = "postgres_backend")]
+pub type jsonb_set<B, J, R> = super::functions::jsonb_set<SqlTypeOf<B>, SqlTypeOf<J>, B, J, R>;

diesel_derives/tests/auto_type.rs

@@ -461,6 +461,7 @@ fn postgres_functions() -> _ {
         row_to_json(pg_extras::record),
         json_populate_record(pg_extras::record, pg_extras::json),
         jsonb_populate_record(pg_extras::record, pg_extras::jsonb),
+        jsonb_set(pg_extras::jsonb, pg_extras::text_array, pg_extras::jsonb),
     )
 }
 
@@ -503,6 +504,11 @@ fn update_and_binary_operator_and_block() -> _ {
     }))
 }
 
+#[auto_type]
+fn count_query() -> _ {
+    users::table.count()
+}
+
 // #[auto_type]
 // fn test_sql_fragment() -> _ {
 //     sql("foo")

diesel_dynamic_schema/README.md

@@ -4,7 +4,6 @@ Query schemas not known at compile time with Diesel
 ===================================================
 
 [![Build Status](https://travis-ci.org/diesel-rs/diesel.svg)](https://travis-ci.org/diesel-rs/diesel-dynamic-schema)
-[![Gitter](https://badges.gitter.im/diesel-rs/diesel.svg)](https://gitter.im/diesel-rs/diesel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 API Documentation: [latest release](https://docs.rs/diesel-dynamic-schema)
 

diesel_dynamic_schema/src/lib.rs

@@ -71,9 +71,9 @@
 //!
 //! ## Getting help
 //!
-//! If you run into problems, Diesel has a very active Gitter room.
+//! If you run into problems, Diesel has a very active discussion forum.
 //! You can come ask for help at
-//! [gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel)
+//! [github.com/diesel-rs/diesel/discussions](https://github.com/diesel-rs/diesel/discussions)
 
 // Built-in Lints
 #![warn(missing_docs)]

examples/postgres/relations/src/main.rs

@@ -10,6 +10,8 @@ pub mod schema;
 use crate::model::*;
 use crate::schema::*;
 
+type DbResult<T> = Result<T, Box<dyn Error + Send + Sync>>;
+
 fn establish_connection() -> PgConnection {
     dotenv().ok();
 
@@ -18,27 +20,23 @@ fn establish_connection() -> PgConnection {
         .unwrap_or_else(|_| panic!("Error connecting to {database_url}"))
 }
 
-fn new_author(conn: &mut PgConnection, name: &str) -> Result<Author, Box<dyn Error + Send + Sync>> {
+fn new_author(conn: &mut PgConnection, name: &str) -> DbResult<Author> {
     let author = diesel::insert_into(authors::table)
         .values(authors::name.eq(name))
         .returning(Author::as_returning())
         .get_result(conn)?;
     Ok(author)
 }
 
-fn new_book(conn: &mut PgConnection, title: &str) -> Result<Book, Box<dyn Error + Send + Sync>> {
+fn new_book(conn: &mut PgConnection, title: &str) -> DbResult<Book> {
     let book = diesel::insert_into(books::table)
         .values(books::title.eq(title))
         .returning(Book::as_returning())
         .get_result(conn)?;
     Ok(book)
 }
 
-fn new_books_author(
-    conn: &mut PgConnection,
-    book_id: i32,
-    author_id: i32,
-) -> Result<BookAuthor, Box<dyn Error + Send + Sync>> {
+fn new_books_author(conn: &mut PgConnection, book_id: i32, author_id: i32) -> DbResult<BookAuthor> {
     let book_author = diesel::insert_into(books_authors::table)
         .values((
             books_authors::book_id.eq(book_id),
@@ -54,7 +52,7 @@ fn new_page(
     page_number: i32,
     content: &str,
     book_id: i32,
-) -> Result<Page, Box<dyn Error + Send + Sync>> {
+) -> DbResult<Page> {
     let page = diesel::insert_into(pages::table)
         .values((
             pages::page_number.eq(page_number),
@@ -66,7 +64,7 @@ fn new_page(
     Ok(page)
 }
 
-fn joins(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn joins(conn: &mut PgConnection) -> DbResult<()> {
     let page_with_book = pages::table
         .inner_join(books::table)
         .filter(books::title.eq("Momo"))
@@ -84,7 +82,7 @@ fn joins(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
     Ok(())
 }
 
-fn one_to_n_relations(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn one_to_n_relations(conn: &mut PgConnection) -> DbResult<()> {
     let momo = books::table
         .filter(books::title.eq("Momo"))
         .select(Book::as_select())
@@ -117,7 +115,7 @@ fn one_to_n_relations(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Sen
     Ok(())
 }
 
-fn m_to_n_relations(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn m_to_n_relations(conn: &mut PgConnection) -> DbResult<()> {
     let astrid_lindgren = authors::table
         .filter(authors::name.eq("Astrid Lindgren"))
         .select(Author::as_select())
@@ -172,7 +170,7 @@ fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     Ok(())
 }
 
-fn setup_data(conn: &mut PgConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn setup_data(conn: &mut PgConnection) -> DbResult<()> {
     // create a book
     let momo = new_book(conn, "Momo")?;
 

examples/sqlite/relations/src/main.rs

@@ -10,6 +10,8 @@ pub mod schema;
 use crate::model::*;
 use crate::schema::*;
 
+type DbResult<T> = Result<T, Box<dyn Error + Send + Sync>>;
+
 fn establish_connection() -> SqliteConnection {
     dotenv().ok();
 
@@ -18,21 +20,15 @@ fn establish_connection() -> SqliteConnection {
         .unwrap_or_else(|_| panic!("Error connecting to {database_url}"))
 }
 
-fn new_author(
-    conn: &mut SqliteConnection,
-    name: &str,
-) -> Result<Author, Box<dyn Error + Send + Sync>> {
+fn new_author(conn: &mut SqliteConnection, name: &str) -> DbResult<Author> {
     let author = diesel::insert_into(authors::table)
         .values(authors::name.eq(name))
         .returning(Author::as_returning())
         .get_result(conn)?;
     Ok(author)
 }
 
-fn new_book(
-    conn: &mut SqliteConnection,
-    title: &str,
-) -> Result<Book, Box<dyn Error + Send + Sync>> {
+fn new_book(conn: &mut SqliteConnection, title: &str) -> DbResult<Book> {
     let book = diesel::insert_into(books::table)
         .values(books::title.eq(title))
         .returning(Book::as_returning())
@@ -44,7 +40,7 @@ fn new_books_author(
     conn: &mut SqliteConnection,
     book_id: i32,
     author_id: i32,
-) -> Result<BookAuthor, Box<dyn Error + Send + Sync>> {
+) -> DbResult<BookAuthor> {
     let book_author = diesel::insert_into(books_authors::table)
         .values((
             books_authors::book_id.eq(book_id),
@@ -60,7 +56,7 @@ fn new_page(
     page_number: i32,
     content: &str,
     book_id: i32,
-) -> Result<Page, Box<dyn Error + Send + Sync>> {
+) -> DbResult<Page> {
     let page = diesel::insert_into(pages::table)
         .values((
             pages::page_number.eq(page_number),
@@ -72,7 +68,7 @@ fn new_page(
     Ok(page)
 }
 
-fn joins(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn joins(conn: &mut SqliteConnection) -> DbResult<()> {
     let page_with_book = pages::table
         .inner_join(books::table)
         .filter(books::title.eq("Momo"))
@@ -90,7 +86,7 @@ fn joins(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error + Send + Sync>
     Ok(())
 }
 
-fn one_to_n_relations(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn one_to_n_relations(conn: &mut SqliteConnection) -> DbResult<()> {
     let momo = books::table
         .filter(books::title.eq("Momo"))
         .select(Book::as_select())
@@ -123,7 +119,7 @@ fn one_to_n_relations(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error +
     Ok(())
 }
 
-fn m_to_n_relations(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn m_to_n_relations(conn: &mut SqliteConnection) -> DbResult<()> {
     let astrid_lindgren = authors::table
         .filter(authors::name.eq("Astrid Lindgren"))
         .select(Author::as_select())
@@ -178,7 +174,7 @@ fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     Ok(())
 }
 
-fn setup_data(conn: &mut SqliteConnection) -> Result<(), Box<dyn Error + Send + Sync>> {
+fn setup_data(conn: &mut SqliteConnection) -> DbResult<()> {
     // create a book
     let momo = new_book(conn, "Momo")?;
 

guide_drafts/trait_derives.md

@@ -960,9 +960,9 @@ error[E0599]: no function or associated item named `belonging_to` found for type
 Please check out other [official guides] and [docs]
 for more information on using the Diesel framework.
 
-If you have any questions, join our [gitter channel],
+If you have any questions, join our [discussion forum],
 the Diesel team is happy to help.
 
 [official guides]: https://diesel.rs/guides/
 [docs]: https://docs.diesel.rs
-[gitter channel]: https://gitter.im/diesel-rs/diesel
+[discussion forum]: https://github.com/diesel-rs/diesel/discussions