wip - IntoEncode

Signed-off-by: Joshua Potts <[email protected]>

Author: iamjpotts

Cargo.lock

@@ -66,6 +66,7 @@ async-io = { version = "2.4.1", optional = true }
 base64 = { version = "0.22.0", default-features = false, features = ["std"] }
 bytes = "1.1.0"
 chrono = { version = "0.4.34", default-features = false, features = ["clock"], optional = true }
+combine = "4.6"
 crc = { version = "3", optional = true }
 crossbeam-queue = "0.3.2"
 either = "1.6.1"

sqlx-core/Cargo.toml

@@ -2,6 +2,7 @@ use crate::any::value::AnyValueKind;
 use crate::any::{Any, AnyTypeInfoKind};
 use crate::arguments::Arguments;
 use crate::encode::{Encode, IsNull};
+use crate::encode_owned::IntoEncode;
 use crate::error::BoxDynError;
 use crate::types::Type;
 use std::sync::Arc;
@@ -21,9 +22,9 @@ impl Arguments for AnyArguments {
 
     fn add<'t, T>(&mut self, value: T) -> Result<(), BoxDynError>
     where
-        T: Encode<'t, Self::Database> + Type<Self::Database>,
+        T: IntoEncode<Self::Database> + Type<Self::Database>,
     {
-        let _: IsNull = value.encode(&mut self.values)?;
+        let _: IsNull = value.into_encode().encode(&mut self.values)?;
         Ok(())
     }
 
@@ -39,24 +40,26 @@ impl AnyArguments {
     #[doc(hidden)]
     pub fn convert_into<'a, A: Arguments>(self) -> Result<A, BoxDynError>
     where
-        Option<i32>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<bool>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<i16>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<i32>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<i64>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<f32>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<f64>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<String>: Type<A::Database> + Encode<'a, A::Database>,
-        Option<Vec<u8>>: Type<A::Database> + Encode<'a, A::Database>,
-        bool: Type<A::Database> + Encode<'a, A::Database>,
-        i16: Type<A::Database> + Encode<'a, A::Database>,
-        i32: Type<A::Database> + Encode<'a, A::Database>,
-        i64: Type<A::Database> + Encode<'a, A::Database>,
-        f32: Type<A::Database> + Encode<'a, A::Database>,
-        f64: Type<A::Database> + Encode<'a, A::Database>,
-        Arc<String>: Type<A::Database> + Encode<'a, A::Database>,
-        Arc<str>: Type<A::Database> + Encode<'a, A::Database>,
-        Arc<Vec<u8>>: Type<A::Database> + Encode<'a, A::Database>,
+        Option<i32>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<bool>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<i16>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<i32>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<i64>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<f32>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<f64>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<String>: IntoEncode<A::Database> + Type<A::Database>,
+        Option<Vec<u8>>: IntoEncode<A::Database> + Type<A::Database>,
+        bool: IntoEncode<A::Database> + Type<A::Database>,
+        i16: IntoEncode<A::Database> + Type<A::Database>,
+        i32: IntoEncode<A::Database> + Type<A::Database>,
+        i64: IntoEncode<A::Database> + Type<A::Database>,
+        f32: IntoEncode<A::Database> + Type<A::Database>,
+        f64: IntoEncode<A::Database> + Type<A::Database>,
+        String: IntoEncode<A::Database> + Type<A::Database>,
+        Vec<u8>: IntoEncode<A::Database> + Type<A::Database>,
+        Arc<String>: IntoEncode<A::Database> + Type<A::Database>,
+        Arc<str>: IntoEncode<A::Database> + Type<A::Database>,
+        Arc<Vec<u8>>: IntoEncode<A::Database> + Type<A::Database>,
     {
         let mut out = A::default();
 

sqlx-core/src/any/arguments.rs

@@ -1,7 +1,7 @@
 //! Types and traits for passing arguments to SQL queries.
 
 use crate::database::Database;
-use crate::encode::Encode;
+use crate::encode_owned::IntoEncode;
 use crate::error::BoxDynError;
 use crate::types::Type;
 use std::fmt::{self, Write};
@@ -17,9 +17,9 @@ pub trait Arguments: Send + Sized + Default {
     fn reserve(&mut self, additional: usize, size: usize);
 
     /// Add the value to the end of the arguments.
-    fn add<'t, T>(&mut self, value: T) -> Result<(), BoxDynError>
+    fn add<T>(&mut self, value: T) -> Result<(), BoxDynError>
     where
-        T: Encode<'t, Self::Database> + Type<Self::Database>;
+        T: IntoEncode<Self::Database> + Type<Self::Database>;
 
     /// The number of arguments that were already added.
     fn len(&self) -> usize;

sqlx-core/src/arguments.rs

@@ -69,7 +69,7 @@ use crate::value::{Value, ValueRef};
 ///
 /// This trait encapsulates a complete set of traits that implement a driver for a
 /// specific database (e.g., MySQL, PostgreSQL).
-pub trait Database: 'static + Sized + Send + Debug {
+pub trait Database: 'static + Sized + Send + Sync + Debug {
     /// The concrete `Connection` implementation for this database.
     type Connection: Connection<Database = Self>;
 

sqlx-core/src/database.rs

@@ -172,9 +172,9 @@ impl_encode_for_smartpointer!(Arc<T>);
 impl_encode_for_smartpointer!(Box<T>);
 impl_encode_for_smartpointer!(Rc<T>);
 
-impl<'q, T, DB: Database> Encode<'q, DB> for Cow<'q, T>
+impl<'q, T, DB: Database> Encode<'q, DB> for Cow<'_, T>
 where
-    T: Encode<'q, DB>,
+    T: for<'e> Encode<'e, DB>,
     T: ToOwned,
 {
     #[inline]
@@ -214,3 +214,12 @@ macro_rules! forward_encode_impl {
         }
     };
 }
+
+impl<'q, DB: Database> Encode<'q, DB> for Box<dyn Encode<'q, DB>> {
+    fn encode_by_ref(
+        &self,
+        buf: &mut <DB as Database>::ArgumentBuffer,
+    ) -> Result<IsNull, BoxDynError> {
+        self.as_ref().encode_by_ref(buf)
+    }
+}