Made condition a Cow

Author: gammelalf

src/conditional.rs

@@ -39,7 +39,7 @@ pub trait BuildCondition<'a>: 'a {
 /**
 This enum represents all available ternary expression.
 */
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum TernaryCondition<'a> {
     /// Between represents "{} BETWEEN {} AND {}" from SQL
     Between(Box<[Condition<'a>; 3]>),
@@ -72,7 +72,7 @@ impl<'a> BuildCondition<'a> for TernaryCondition<'a> {
 /**
 This enum represents a binary expression.
 */
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum BinaryCondition<'a> {
     /// Representation of "{} = {}" in SQL
     Equals(Box<[Condition<'a>; 2]>),
@@ -133,7 +133,7 @@ impl<'a> BuildCondition<'a> for BinaryCondition<'a> {
 /**
 This enum represents all available unary conditions.
 */
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum UnaryCondition<'a> {
     /// Representation of SQL's "{} IS NULL"
     IsNull(Box<Condition<'a>>),
@@ -177,7 +177,7 @@ impl<'a> BuildCondition<'a> for UnaryCondition<'a> {
 /**
 This enum represents a condition tree.
 */
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum Condition<'a> {
     /// A list of [Condition]s, that get expanded to "{} AND {} ..."
     Conjunction(Vec<Condition<'a>>),

src/join_table.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::fmt::{Display, Formatter, Write};
 
 use crate::conditional::{BuildCondition, Condition};
@@ -63,13 +64,13 @@ pub trait JoinTable<'post_query> {
     - `s`: Mutable reference to String to write to.
     - `lookup`: List of values for bind parameter.
     */
-    fn build(self, s: &mut String, lookup: &mut Vec<Value<'post_query>>);
+    fn build(&self, s: &mut String, lookup: &mut Vec<Value<'post_query>>);
 }
 
 /**
 Data of a JOIN expression.
 */
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Clone)]
 pub struct JoinTableData<'until_build, 'post_query> {
     /// Type of the join operation
     pub join_type: JoinType,
@@ -78,15 +79,15 @@ pub struct JoinTableData<'until_build, 'post_query> {
     /// Alias for the join table
     pub join_alias: &'until_build str,
     /// Condition to apply the join on
-    pub join_condition: &'until_build Condition<'post_query>,
+    pub join_condition: Cow<'until_build, Condition<'post_query>>,
 }
 
 /**
 Representation of the JOIN expression
 
 Should only be constructed via [DBImpl::join_table].
 */
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Clone)]
 pub enum JoinTableImpl<'until_build, 'post_query> {
     /**
     SQLite representation of a JOIN expression.
@@ -108,7 +109,7 @@ pub enum JoinTableImpl<'until_build, 'post_query> {
 impl<'until_build, 'post_query> JoinTable<'post_query>
     for JoinTableImpl<'until_build, 'post_query>
 {
-    fn build(self, s: &mut String, lookup: &mut Vec<Value<'post_query>>) {
+    fn build(&self, s: &mut String, lookup: &mut Vec<Value<'post_query>>) {
         match self {
             #[cfg(feature = "sqlite")]
             JoinTableImpl::SQLite(d) => write!(

src/lib.rs

@@ -46,54 +46,34 @@ pub mod value;
 
 mod db_specific;
 
-use rorm_declaration::imr::Annotation;
-use rorm_declaration::imr::DbType;
+use std::borrow::Cow;
+
+use rorm_declaration::imr::{Annotation, DbType};
 
 use crate::aggregation::SelectAggregator;
-use crate::alter_table::AlterTable;
-use crate::alter_table::AlterTableData;
-use crate::alter_table::AlterTableImpl;
-use crate::alter_table::AlterTableOperation;
+use crate::alter_table::{AlterTable, AlterTableData, AlterTableImpl, AlterTableOperation};
 use crate::conditional::Condition;
-use crate::create_column::CreateColumnImpl;
 #[cfg(feature = "mysql")]
 use crate::create_column::CreateColumnMySQLData;
 #[cfg(feature = "postgres")]
 use crate::create_column::CreateColumnPostgresData;
 #[cfg(feature = "sqlite")]
 use crate::create_column::CreateColumnSQLiteData;
-use crate::create_column::SQLAnnotation;
-use crate::create_index::CreateIndex;
-use crate::create_index::CreateIndexData;
-use crate::create_index::CreateIndexImpl;
-use crate::create_table::CreateTable;
-use crate::create_table::CreateTableData;
-use crate::create_table::CreateTableImpl;
-use crate::create_trigger::SQLCreateTrigger;
-use crate::create_trigger::SQLCreateTriggerOperation;
-use crate::create_trigger::SQLCreateTriggerPointInTime;
-use crate::delete::Delete;
-use crate::delete::DeleteData;
-use crate::delete::DeleteImpl;
-use crate::drop_table::DropTable;
-use crate::drop_table::DropTableData;
-use crate::drop_table::DropTableImpl;
-use crate::insert::Insert;
-use crate::insert::InsertData;
-use crate::insert::InsertImpl;
-use crate::join_table::JoinTableData;
-use crate::join_table::JoinTableImpl;
-use crate::join_table::JoinType;
+use crate::create_column::{CreateColumnImpl, SQLAnnotation};
+use crate::create_index::{CreateIndex, CreateIndexData, CreateIndexImpl};
+use crate::create_table::{CreateTable, CreateTableData, CreateTableImpl};
+use crate::create_trigger::{
+    SQLCreateTrigger, SQLCreateTriggerOperation, SQLCreateTriggerPointInTime,
+};
+use crate::delete::{Delete, DeleteData, DeleteImpl};
+use crate::drop_table::{DropTable, DropTableData, DropTableImpl};
+use crate::insert::{Insert, InsertData, InsertImpl};
+use crate::join_table::{JoinTableData, JoinTableImpl, JoinType};
 use crate::on_conflict::OnConflict;
 use crate::ordering::OrderByEntry;
-use crate::select::Select;
-use crate::select::SelectData;
-use crate::select::SelectImpl;
-use crate::select_column::SelectColumnData;
-use crate::select_column::SelectColumnImpl;
-use crate::update::Update;
-use crate::update::UpdateData;
-use crate::update::UpdateImpl;
+use crate::select::{Select, SelectData, SelectImpl};
+use crate::select_column::{SelectColumnData, SelectColumnImpl};
+use crate::update::{Update, UpdateData, UpdateImpl};
 use crate::value::Value;
 
 /**
@@ -468,7 +448,7 @@ impl DBImpl {
         join_type: JoinType,
         table_name: &'until_build str,
         join_alias: &'until_build str,
-        join_condition: &'until_build Condition<'post_query>,
+        join_condition: Cow<'until_build, Condition<'post_query>>,
     ) -> JoinTableImpl<'until_build, 'post_query> {
         let d = JoinTableData {
             join_type,