Merge pull request #4795 from weiznich/fix/bind_params

Try to fix binds for multiconnection

Author: weiznich

diesel/src/query_builder/ast_pass.rs

@@ -385,6 +385,15 @@ where
     /// This function allows to access the inner bind collector if
     /// this `AstPass` represents a collect binds pass.
     fn bind_collector(&mut self) -> Option<(&mut DB::BindCollector<'b>, &mut DB::MetadataLookup)>;
+
+    /// This function allows to access the inner debug bind collector pass
+    fn debug_binds(&mut self) -> Option<(&mut Vec<Box<dyn fmt::Debug + 'b>>, &'b DB)>;
+
+    /// Construct a new AstPass for collecting bind values into the provided buffer
+    fn collect_debug_binds_pass(
+        formatter: &'a mut Vec<Box<dyn fmt::Debug + 'b>>,
+        backend: &'b DB,
+    ) -> AstPass<'a, 'b, DB>;
 }
 
 impl<'a, 'b, DB> AstPassHelper<'a, 'b, DB> for AstPass<'a, 'b, DB>
@@ -442,4 +451,19 @@ where
             None
         }
     }
+
+    fn debug_binds(&mut self) -> Option<(&mut Vec<Box<dyn fmt::Debug + 'b>>, &'b DB)> {
+        if let AstPassInternals::DebugBinds(formatter) = &mut self.internals {
+            Some((formatter, self.backend))
+        } else {
+            None
+        }
+    }
+
+    fn collect_debug_binds_pass(
+        formatter: &'a mut Vec<Box<dyn fmt::Debug + 'b>>,
+        backend: &'b DB,
+    ) -> AstPass<'a, 'b, DB> {
+        AstPass::debug_binds(formatter, backend)
+    }
 }

diesel_derives/src/multiconnection.rs

@@ -317,6 +317,10 @@ fn generate_connection_impl(
                 if let Some((outer_collector, lookup)) = pass.bind_collector() {
                     C::handle_inner_pass(outer_collector, lookup, &self.backend, &self.inner)?;
                 }
+                if let Some((formatter, _backend)) = pass.debug_binds() {
+                    let pass = diesel::query_builder::AstPass::<MultiBackend>::collect_debug_binds_pass(formatter, &self.backend);
+                    self.inner.walk_ast(pass)?;
+                }
                 Ok(())
             }
         }

diesel_derives/src/tests/snapshots/diesel_derives__tests__multiconnection_1.snap

@@ -1747,6 +1747,12 @@ mod multi_connection_impl {
                         &self.inner,
                     )?;
                 }
+                if let Some((formatter, _backend)) = pass.debug_binds() {
+                    let pass = diesel::query_builder::AstPass::<
+                        MultiBackend,
+                    >::collect_debug_binds_pass(formatter, &self.backend);
+                    self.inner.walk_ast(pass)?;
+                }
                 Ok(())
             }
         }

diesel_derives/tests/multiconnection.rs

@@ -457,3 +457,24 @@ fn nullable_type_checks() {
     assert!(result.12.is_none());
     assert!(result.13.is_none());
 }
+
+#[test]
+#[cfg(not(feature = "mysql"))] // such binds are broken for mysql + multiconnection
+fn contains_binds() {
+    use diesel::connection::InstrumentationEvent;
+
+    let mut conn = establish_connection();
+    conn.set_instrumentation(|event: InstrumentationEvent<'_>| {
+        if let InstrumentationEvent::StartQuery { query, .. } = event {
+            #[cfg(any(feature = "sqlite", feature = "mysql"))]
+            assert_eq!(query.to_string(), "SELECT ? -- binds: [1]");
+            #[cfg(feature = "postgres")]
+            assert_eq!(query.to_string(), "SELECT $1 -- binds: [1]");
+        }
+    });
+
+    let res = diesel::select(1.into_sql::<diesel::sql_types::Integer>())
+        .get_result::<i32>(&mut conn)
+        .unwrap();
+    assert_eq!(res, 1);
+}