Impl UndecoratedInsertRecord for OwnedBatchInsert.

Same as diesel-rs#1932 but rebased onto the current `master`.

Author: icefoxen

diesel/src/insertable.rs

@@ -113,7 +113,7 @@ where
     }
 }
 
-impl<T, DB> CanInsertInSingleQuery<DB> for OwnedBatchInsert<T>
+impl<T, Table, DB> CanInsertInSingleQuery<DB> for OwnedBatchInsert<T, Table>
 where
     DB: Backend + SupportsDefaultKeyword,
 {
@@ -233,11 +233,12 @@ impl<T, Tab> Insertable<Tab> for Vec<T>
 where
     T: Insertable<Tab> + UndecoratedInsertRecord<Tab>,
 {
-    type Values = OwnedBatchInsert<T::Values>;
+    type Values = OwnedBatchInsert<T::Values, Tab>;
 
     fn values(self) -> Self::Values {
         OwnedBatchInsert {
             values: self.into_iter().map(Insertable::values).collect(),
+            _marker: PhantomData,
         }
     }
 }
@@ -293,11 +294,12 @@ where
 }
 
 #[derive(Debug)]
-pub struct OwnedBatchInsert<V> {
+pub struct OwnedBatchInsert<V, Tab> {
     pub(crate) values: Vec<V>,
+    _marker: PhantomData<Tab>,
 }
 
-impl<Tab, DB, Inner> QueryFragment<DB> for OwnedBatchInsert<ValuesClause<Inner, Tab>>
+impl<Tab, DB, Inner> QueryFragment<DB> for OwnedBatchInsert<ValuesClause<Inner, Tab>, Tab>
 where
     DB: Backend + SupportsDefaultKeyword,
     ValuesClause<Inner, Tab>: QueryFragment<DB>,

diesel/src/query_builder/insert_statement/mod.rs

@@ -249,7 +249,7 @@ where
 
 #[cfg(feature = "sqlite")]
 impl<T, U, Op> ExecuteDsl<SqliteConnection>
-    for InsertStatement<T, OwnedBatchInsert<ValuesClause<U, T>>, Op>
+    for InsertStatement<T, OwnedBatchInsert<ValuesClause<U, T>, T>, Op>
 where
     InsertStatement<T, ValuesClause<U, T>, Op>: QueryFragment<Sqlite>,
     T: Copy,
@@ -406,7 +406,17 @@ impl<'a, T, Table> UndecoratedInsertRecord<Table> for BatchInsert<'a, T, Table>
 {
 }
 
-impl<T, Table> UndecoratedInsertRecord<Table> for Vec<T> where [T]: UndecoratedInsertRecord<Table> {}
+impl<T, Table> UndecoratedInsertRecord<Table> for OwnedBatchInsert<T, Table>
+where
+    T: UndecoratedInsertRecord<Table>,
+{
+}
+
+impl<T, Table> UndecoratedInsertRecord<Table> for Vec<T>
+where
+    [T]: UndecoratedInsertRecord<Table>,
+{
+}
 
 impl<Lhs, Rhs> UndecoratedInsertRecord<Lhs::Table> for Eq<Lhs, Rhs> where Lhs: Column {}
 

diesel_tests/tests/update.rs

@@ -243,6 +243,17 @@ fn upsert_with_no_changes_executes_do_nothing() {
         .execute(&connection);
 
     assert_eq!(Ok(0), result);
+
+    // Try the same thing with an owned type.
+    let connection = connection_with_sean_and_tess_in_users_table();
+    let result = insert_into(users::table)
+        .values(User::new(1, "Sean"))
+        .on_conflict(users::id)
+        .do_update()
+        .set(&Changes { hair_color: None })
+        .execute(&connection);
+
+    assert_eq!(Ok(0), result);
 }
 
 #[test]