Merge pull request diesel-rs#2827 from weiznich/prepared_statements_for_certain_insert_variants

Various insert improvments

Author: weiznich

.github/workflows/benches.yml

@@ -10,6 +10,7 @@ jobs:
     if: github.event.label.name == 'run-benchmarks'
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         backend: ["postgres", "sqlite", "mysql"]
     steps:

.github/workflows/ci.yml

@@ -325,7 +325,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.48.0
+          toolchain: 1.51.0
           profile: minimal
           components: clippy, rustfmt
           override: true
@@ -389,13 +389,13 @@ jobs:
           args: --manifest-path diesel_cli/Cargo.toml --no-default-features --features "sqlite-bundled"
 
   minimal_rust_version:
-    name: Check Minimal supported rust version (1.48.0)
+    name: Check Minimal supported rust version (1.51.0)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.48.0
+          toolchain: 1.51.0
           profile: minimal
           override: true
       - name: Cache cargo registry
@@ -413,7 +413,7 @@ jobs:
         run: |
           RUSTC_BOOTSTRAP=1 cargo update -Z minimal-versions
 
-      - name: Check building with rust 1.48.0
+      - name: Check building with rust 1.51.0
         uses: actions-rs/cargo@v1
         with:
           command: check

CHANGELOG.md

@@ -66,6 +66,8 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
 
 * Diesel CLI will now generate SQL type definitions for SQL types that are not supported by diesel out of the box. It's possible to disable this behavior via the `generate_missing_sql_type_definitions` config option.
 
+* Added an option to `#[derive(Insertable)]` that let you insert `NULL` values instead of `DEFAULT` values for `Option<T>` 
+
 ### Removed
 
 * All previously deprecated items have been removed.
@@ -97,7 +99,7 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   you are implementing `HasSqlType` for `Mysql` manually, you may need to adjust
   your implementation to fully use the new unsigned variants in `MysqlType`
 
-* The minimal officially supported rustc version is now 1.48.0
+* The minimal officially supported rustc version is now 1.51.0
 
 * The `RawValue` types for the `Mysql` and `Postgresql` backend where changed
   from `[u8]` to distinct opaque types. If you used the concrete `RawValue` type

diesel/src/backend.rs

@@ -61,6 +61,9 @@ pub trait HasRawValue<'a> {
 }
 
 /// A trait indicating that the provided raw value uses a binary representation internally
+// That's a false positive, `HasRawValue<'a>` is essentially
+// a reference wrapper
+#[allow(clippy::wrong_self_convention)]
 pub trait BinaryRawValue<'a>: HasRawValue<'a> {
     /// Get the underlying binary representation of the raw value
     fn as_bytes(value: Self::RawValue) -> &'a [u8];

diesel/src/expression/array_comparison.rs

@@ -96,6 +96,9 @@ impl_selectable_expression!(NotIn<T, U>);
 pub trait AsInExpression<T: SqlType + TypedExpressionType> {
     type InExpression: MaybeEmpty + Expression<SqlType = T>;
 
+    #[allow(clippy::wrong_self_convention)]
+    // That's a public api, we cannot just change it to
+    // appease clippy
     fn as_in_expression(self) -> Self::InExpression;
 }
 

diesel/src/expression/functions/mod.rs

@@ -11,11 +11,7 @@ macro_rules! no_arg_sql_function_body_except_to_sql {
         #[allow(non_camel_case_types)]
         #[doc=$docs]
         #[derive(
-            Debug,
-            Clone,
-            Copy,
-            $crate::query_builder::QueryId,
-            $crate::expression::ValidGrouping
+            Debug, Clone, Copy, $crate::query_builder::QueryId, $crate::expression::ValidGrouping,
         )]
         pub struct $type_name;
 

diesel/src/expression/mod.rs

@@ -205,6 +205,8 @@ where
     type Expression: Expression<SqlType = T>;
 
     /// Perform the conversion
+    #[allow(clippy::wrong_self_convention)]
+    // That's public API we cannot change it to appease clippy
     fn as_expression(self) -> Self::Expression;
 }
 
@@ -840,5 +842,8 @@ pub trait AsExpressionList<ST> {
     type Expression;
 
     /// Perform the conversion
+    // That's public API, we cannot change
+    // that to appease clippy
+    #[allow(clippy::wrong_self_convention)]
     fn as_expression_list(self) -> Self::Expression;
 }

diesel/src/expression/operators.rs

@@ -539,7 +539,7 @@ where
     type Values = ValuesClause<ColumnInsertValue<T, U>, T::Table>;
 
     fn values(self) -> Self::Values {
-        ValuesClause::new(ColumnInsertValue::Expression(self.left, self.right))
+        ValuesClause::new(ColumnInsertValue::new(self.left, self.right))
     }
 }
 

diesel/src/expression_methods/global_expression_methods.rs

@@ -159,6 +159,11 @@ pub trait ExpressionMethods: Expression + Sized {
     /// assert_eq!("spider", data);
     /// #     Ok(())
     /// # }
+    // This method is part of the public API,
+    // so we cannot just change the name to appease clippy
+    // (Otherwise it's also named after the `IS NULL` sql expression
+    // so that name is really fine)
+    #[allow(clippy::wrong_self_convention)]
     fn is_null(self) -> dsl::IsNull<Self> {
         Grouped(IsNull::new(self))
     }
@@ -185,6 +190,11 @@ pub trait ExpressionMethods: Expression + Sized {
     /// assert_eq!("dog", data);
     /// #     Ok(())
     /// # }
+    // This method is part of the public API,
+    // so we cannot just change the name to appease clippy
+    // (Otherwise it's also named after the `IS NOT NULL` sql expression
+    // so that name is really fine)
+    #[allow(clippy::wrong_self_convention)]
     fn is_not_null(self) -> dsl::IsNotNull<Self> {
         Grouped(IsNotNull::new(self))
     }