Merge pull request #4236 from xmtp/insipx/sqlite-replace-ignore-pub

Makes `InsertOrIgnore`/`Replace` + items in `combination_clause` public for 3rd party backends

Author: weiznich

diesel/src/query_builder/combination_clause.rs

@@ -57,8 +57,8 @@ impl<Combinator, Rule, Source, Rhs> CombinationClause<Combinator, Rule, Source,
         CombinationClause {
             combinator,
             duplicate_rule,
-            source: ParenthesisWrapper(source),
-            rhs: ParenthesisWrapper(rhs),
+            source: ParenthesisWrapper { inner: source },
+            rhs: ParenthesisWrapper { inner: rhs },
             order: NoOrderClause,
             limit_offset: LimitOffsetClause {
                 limit_clause: NoLimitClause,
@@ -357,7 +357,15 @@ pub trait SupportsCombinationClause<Combinator, Rule> {}
 
 #[derive(Debug, Copy, Clone, QueryId)]
 /// Wrapper used to wrap rhs sql in parenthesis when supported by backend
-pub struct ParenthesisWrapper<T>(T);
+#[diesel_derives::__diesel_public_if(
+    feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
+    public_fields(inner)
+)]
+pub struct ParenthesisWrapper<T> {
+    /// the inner parenthesis definition
+    #[allow(dead_code)]
+    inner: T,
+}
 
 #[cfg(feature = "postgres_backend")]
 mod postgres {
@@ -367,7 +375,7 @@ mod postgres {
     impl<T: QueryFragment<Pg>> QueryFragment<Pg> for ParenthesisWrapper<T> {
         fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
             out.push_sql("(");
-            self.0.walk_ast(out.reborrow())?;
+            self.inner.walk_ast(out.reborrow())?;
             out.push_sql(")");
             Ok(())
         }
@@ -389,7 +397,7 @@ mod mysql {
     impl<T: QueryFragment<Mysql>> QueryFragment<Mysql> for ParenthesisWrapper<T> {
         fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Mysql>) -> QueryResult<()> {
             out.push_sql("(");
-            self.0.walk_ast(out.reborrow())?;
+            self.inner.walk_ast(out.reborrow())?;
             out.push_sql(")");
             Ok(())
         }
@@ -410,7 +418,7 @@ mod sqlite {
             // we can emulate this by construct a fake outer
             // SELECT * FROM (inner_query) statement
             out.push_sql("SELECT * FROM (");
-            self.0.walk_ast(out.reborrow())?;
+            self.inner.walk_ast(out.reborrow())?;
             out.push_sql(")");
             Ok(())
         }

diesel/src/query_builder/insert_statement/mod.rs

@@ -5,6 +5,9 @@ mod insert_from_select;
 pub(crate) use self::batch_insert::BatchInsert;
 pub(crate) use self::column_list::ColumnList;
 pub(crate) use self::insert_from_select::InsertFromSelect;
+#[diesel_derives::__diesel_public_if(
+    feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes"
+)]
 pub(crate) use self::private::{Insert, InsertOrIgnore, Replace};
 
 use super::returning_clause::*;

diesel/src/query_builder/mod.rs

@@ -64,6 +64,10 @@ pub use self::update_statement::target::{IntoUpdateTarget, UpdateTarget};
 #[doc(inline)]
 pub use self::update_statement::{BoxedUpdateStatement, UpdateStatement};
 
+#[cfg(feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes")]
+pub use self::combination_clause::{
+    All, Distinct, Except, Intersect, ParenthesisWrapper, SupportsCombinationClause, Union,
+};
 #[cfg(feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes")]
 pub use self::limit_clause::{LimitClause, NoLimitClause};
 #[cfg(feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes")]
@@ -83,7 +87,7 @@ pub(crate) use self::insert_statement::{UndecoratedInsertRecord, ValuesClause};
 
 #[cfg(feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes")]
 #[doc(inline)]
-pub use self::insert_statement::DefaultValues;
+pub use self::insert_statement::{DefaultValues, InsertOrIgnore, Replace};
 
 #[cfg(feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes")]
 #[doc(inline)]