Add Clone as supertrait to Statement

Author: joeydewaal

sqlx-core/src/any/statement.rs

@@ -9,6 +9,7 @@ use crate::HashMap;
 use either::Either;
 use std::sync::Arc;
 
+#[derive(Clone)]
 pub struct AnyStatement {
     #[doc(hidden)]
     pub sql: SqlStr,
@@ -23,15 +24,6 @@ pub struct AnyStatement {
 impl Statement for AnyStatement {
     type Database = Any;
 
-    fn to_owned(&self) -> AnyStatement {
-        AnyStatement {
-            sql: self.sql.clone(),
-            column_names: self.column_names.clone(),
-            parameters: self.parameters.clone(),
-            columns: self.columns.clone(),
-        }
-    }
-
     fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }

sqlx-core/src/statement.rs

@@ -17,13 +17,9 @@ use either::Either;
 ///
 /// Statements can be re-used with any connection and on first-use it will be re-prepared and
 /// cached within the connection.
-pub trait Statement: Send + Sync {
+pub trait Statement: Send + Sync + Clone {
     type Database: Database;
 
-    /// Creates an owned statement from this statement reference. This copies
-    /// the original SQL text.
-    fn to_owned(&self) -> <Self::Database as Database>::Statement;
-
     /// Get the original SQL text used to create this statement.
     fn sql_cloned(&self) -> SqlStr;
 

sqlx-mysql/src/statement.rs

@@ -26,13 +26,6 @@ pub(crate) struct MySqlStatementMetadata {
 impl Statement for MySqlStatement {
     type Database = MySql;
 
-    fn to_owned(&self) -> MySqlStatement {
-        MySqlStatement {
-            sql: self.sql.clone(),
-            metadata: self.metadata.clone(),
-        }
-    }
-
     fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }

sqlx-postgres/src/statement.rs

@@ -27,13 +27,6 @@ pub(crate) struct PgStatementMetadata {
 impl Statement for PgStatement {
     type Database = Postgres;
 
-    fn to_owned(&self) -> PgStatement {
-        PgStatement {
-            sql: self.sql.clone(),
-            metadata: self.metadata.clone(),
-        }
-    }
-
     fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }

sqlx-sqlite/src/statement/mod.rs

@@ -27,15 +27,6 @@ pub struct SqliteStatement {
 impl Statement for SqliteStatement {
     type Database = Sqlite;
 
-    fn to_owned(&self) -> SqliteStatement {
-        SqliteStatement {
-            sql: self.sql.clone(),
-            parameters: self.parameters,
-            columns: Arc::clone(&self.columns),
-            column_names: Arc::clone(&self.column_names),
-        }
-    }
-
     fn sql_cloned(&self) -> SqlStr {
         self.sql.clone()
     }