Reduce the amount of SqlStr clones

Author: joeydewaal

sqlx-core/src/any/statement.rs

@@ -32,10 +32,14 @@ impl Statement for AnyStatement {
         }
     }
 
-    fn sql(&self) -> SqlStr {
+    fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }
 
+    fn into_sql(self) -> SqlStr {
+        self.sql
+    }
+
     fn parameters(&self) -> Option<Either<&[AnyTypeInfo], usize>> {
         match &self.parameters {
             Some(Either::Left(types)) => Some(Either::Left(types)),
@@ -64,8 +68,7 @@ impl<'i> ColumnIndex<AnyStatement> for &'i str {
 impl<'q> AnyStatement {
     #[doc(hidden)]
     pub fn try_from_statement<S>(
-        query: SqlStr,
-        statement: &S,
+        statement: S,
         column_names: Arc<HashMap<UStr, usize>>,
     ) -> crate::Result<Self>
     where
@@ -91,7 +94,7 @@ impl<'q> AnyStatement {
             .collect::<Result<Vec<_>, _>>()?;
 
         Ok(Self {
-            sql: query,
+            sql: statement.into_sql(),
             columns,
             column_names,
             parameters,

sqlx-core/src/query.rs

@@ -47,7 +47,7 @@ where
     #[inline]
     fn sql(self) -> SqlStr {
         match self.statement {
-            Either::Right(statement) => statement.sql(),
+            Either::Right(statement) => statement.sql_cloned(),
             Either::Left(sql) => sql,
         }
     }

sqlx-core/src/statement.rs

@@ -25,7 +25,9 @@ pub trait Statement: Send + Sync {
     fn to_owned(&self) -> <Self::Database as Database>::Statement;
 
     /// Get the original SQL text used to create this statement.
-    fn sql(&self) -> SqlStr;
+    fn sql_cloned(&self) -> SqlStr;
+
+    fn into_sql(self) -> SqlStr;
 
     /// Get the expected parameters for this statement.
     ///

sqlx-mysql/src/any.rs

@@ -132,12 +132,9 @@ impl AnyConnectionBackend for MySqlConnection {
         _parameters: &[AnyTypeInfo],
     ) -> BoxFuture<'c, sqlx_core::Result<AnyStatement>> {
         Box::pin(async move {
-            let statement = Executor::prepare_with(self, sql.clone(), &[]).await?;
-            AnyStatement::try_from_statement(
-                sql,
-                &statement,
-                statement.metadata.column_names.clone(),
-            )
+            let statement = Executor::prepare_with(self, sql, &[]).await?;
+            let column_names = statement.metadata.column_names.clone();
+            AnyStatement::try_from_statement(statement, column_names)
         })
     }
 

sqlx-mysql/src/statement.rs

@@ -33,10 +33,14 @@ impl Statement for MySqlStatement {
         }
     }
 
-    fn sql(&self) -> SqlStr {
+    fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }
 
+    fn into_sql(self) -> SqlStr {
+        self.sql
+    }
+
     fn parameters(&self) -> Option<Either<&[MySqlTypeInfo], usize>> {
         Some(Either::Right(self.metadata.parameters))
     }

sqlx-postgres/src/any.rs

@@ -132,12 +132,9 @@ impl AnyConnectionBackend for PgConnection {
         _parameters: &[AnyTypeInfo],
     ) -> BoxFuture<'c, sqlx_core::Result<AnyStatement>> {
         Box::pin(async move {
-            let statement = Executor::prepare_with(self, sql.clone(), &[]).await?;
-            AnyStatement::try_from_statement(
-                sql,
-                &statement,
-                statement.metadata.column_names.clone(),
-            )
+            let statement = Executor::prepare_with(self, sql, &[]).await?;
+            let colunn_names = statement.metadata.column_names.clone();
+            AnyStatement::try_from_statement(statement, colunn_names)
         })
     }
 

sqlx-postgres/src/statement.rs

@@ -34,10 +34,14 @@ impl Statement for PgStatement {
         }
     }
 
-    fn sql(&self) -> SqlStr {
+    fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }
 
+    fn into_sql(self) -> SqlStr {
+        self.sql
+    }
+
     fn parameters(&self) -> Option<Either<&[PgTypeInfo], usize>> {
         Some(Either::Left(&self.metadata.parameters))
     }

sqlx-sqlite/src/any.rs

@@ -128,8 +128,9 @@ impl AnyConnectionBackend for SqliteConnection {
         _parameters: &[AnyTypeInfo],
     ) -> BoxFuture<'c, sqlx_core::Result<AnyStatement>> {
         Box::pin(async move {
-            let statement = Executor::prepare_with(self, sql.clone(), &[]).await?;
-            AnyStatement::try_from_statement(sql, &statement, statement.column_names.clone())
+            let statement = Executor::prepare_with(self, sql, &[]).await?;
+            let column_names = statement.column_names.clone();
+            AnyStatement::try_from_statement(statement, column_names)
         })
     }
 

sqlx-sqlite/src/statement/mod.rs

@@ -36,10 +36,14 @@ impl Statement for SqliteStatement {
         }
     }
 
-    fn sql(&self) -> SqlStr {
+    fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }
 
+    fn into_sql(self) -> SqlStr {
+        self.sql
+    }
+
     fn parameters(&self) -> Option<Either<&[SqliteTypeInfo], usize>> {
         Some(Either::Right(self.parameters))
     }