Fix on_constraint

Author: h-michael

diesel/src/pg/mod.rs

@@ -15,7 +15,7 @@ mod metadata_lookup;
 mod query_builder;
 pub(crate) mod serialize;
 mod transaction;
-pub mod on_constraint;
+pub(crate) mod on_constraint;
 mod value;
 
 pub use self::backend::{Pg, PgTypeMetadata};

diesel/src/pg/on_constraint.rs

@@ -4,18 +4,18 @@
 
 use pg::Pg;
 use query_builder::*;
-use upsert::{ConflictTarget};
+use upsert::{ConflictTarget, OnConflictTarget};
 use result::QueryResult;
 
 /// # Example
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("on_conflict_docs_setup.rs");
+/// # include!("../upsert/on_conflict_docs_setup.rs");
 /// #
 /// # fn main() {
 /// #     use users::dsl::*;
-/// use diesel::upsert::*;
+/// use diesel::pg::upsert::*;
 ///
 /// #     let conn = establish_connection();
 /// #     conn.execute("TRUNCATE TABLE users").unwrap();
@@ -61,3 +61,5 @@ impl<'a> QueryFragment<Pg> for ConflictTarget<OnConstraint<'a>>
         Ok(())
     }
 }
+
+impl<'a, Table> OnConflictTarget<Table> for ConflictTarget<OnConstraint<'a>> {}

diesel/src/upsert/mod.rs

@@ -13,4 +13,4 @@ pub use self::on_conflict_extension::*;
 pub use self::on_conflict_target::{ConflictTarget, OnConflictTarget};
 
 #[cfg(feature = "postgres")]
-pub use self::on_conflict_target::on_constraint;
+pub use self::on_conflict_target::*;

diesel/src/upsert/on_conflict_actions.rs

@@ -13,7 +13,10 @@ pub fn excluded<T>(excluded: T) -> Excluded<T> {
 #[derive(Debug, Clone, Copy)]
 pub struct DoNothing;
 
-impl<DB: Backend + SupportsOnConflictClause> QueryFragment<DB> for DoNothing {
+impl<DB> QueryFragment<DB> for DoNothing
+where
+    DB: Backend + SupportsOnConflictClause,
+{
     fn walk_ast(&self, mut out: AstPass<DB>) -> QueryResult<()> {
         out.push_sql(" DO NOTHING");
         Ok(())

diesel/src/upsert/on_conflict_target.rs

@@ -5,7 +5,7 @@ use crate::query_source::Column;
 use crate::result::QueryResult;
 
 #[cfg(feature = "postgres")]
-pub use pg::on_constraint;
+pub use pg::on_constraint::*;
 
 #[doc(hidden)]
 pub trait OnConflictTarget<Table> {}