refactor(WIP-5)!: Querybuilder public interface

Author: TheRustifyer

canyon_core/src/connection/clients/mssql.rs

@@ -130,7 +130,7 @@ impl DbConnection for SqlServerConnector {
             .map_err(From::from)
     }
 
-    fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
+    async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
         Ok(DatabaseType::SqlServer)
     }
 }

canyon_core/src/connection/clients/mysql.rs

@@ -87,7 +87,7 @@ impl DbConnection for MySQLConnector {
         Ok(mysql_stmt.run(mysql_connection).await?.affected_rows())
     }
 
-    fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
+    async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
         Ok(DatabaseType::MySQL)
     }
 }

canyon_core/src/connection/clients/postgresql.rs

@@ -110,7 +110,7 @@ impl DbConnection for PostgresConnector {
             .map_err(From::from)
     }
 
-    fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
+    async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
         Ok(DatabaseType::PostgreSql)
     }
 }

canyon_core/src/connection/contracts/mod.rs

@@ -114,5 +114,5 @@ pub trait DbConnection {
     ///
     /// # Returns
     /// A `Result` containing the [`DatabaseType`] on success or an error on failure.
-    fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>>;
+    async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>>;
 }

canyon_core/src/connection/database_type.rs

@@ -33,7 +33,7 @@ impl From<&Auth> for DatabaseType {
 /// The default implementation for [`DatabaseType`] returns the database type for the first
 /// datasource configured
 impl DatabaseType {
-    pub fn default_type() -> Result<Self, Box<dyn Error + Send + Sync>> {
+    pub async fn default_type() -> Result<Self, Box<dyn Error + Send + Sync>> {
         Canyon::instance()?
             .get_default_db_type()
             .map_err(|err| Box::new(err) as Box<dyn Error + Send + Sync>)

canyon_core/src/connection/impl_db_connection_macro.rs

@@ -104,7 +104,7 @@ macro_rules! impl_db_connection_for_db_connector {
                 }
             }
 
-            fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
+            async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
                 Ok(self.get_db_type())
             }
         }
@@ -168,7 +168,7 @@ macro_rules! impl_db_connection_for_str {
                 conn.execute(stmt, params).await
             }
 
-            fn get_database_type(
+            async fn get_database_type(
                 &self,
             ) -> Result<
                 $crate::connection::database_type::DatabaseType,

canyon_core/src/connection/mod.rs

@@ -117,7 +117,7 @@ where
         self.lock().await.execute(stmt, params).await
     }
 
-    fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
+    async fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
         todo!()
     }
 }

canyon_core/src/query/querybuilder/contracts/mod.rs

@@ -11,7 +11,7 @@ pub trait DeleteQueryBuilderOps<'a>: QueryBuilderOps<'a> {}
 pub trait UpdateQueryBuilderOps<'a>: QueryBuilderOps<'a> {
     /// Creates an SQL `SET` clause by specifying the columns that must be updated in the sentence,
     /// but without adding any [`QueryParameter`] value to the internal querybuilder
-    fn set(self, columns: &'a [&'a str]) -> Result<Self, Box<dyn Error + Send + Sync + 'a>>
+    fn set(self, columns: &'a [String]) -> Result<Self, Box<dyn Error + Send + Sync + 'a>>
           where Self: std::marker::Sized;
 
     /// Similar to [`Self::set`] but storing the underlying update values for each column in the

canyon_core/src/query/querybuilder/types/delete.rs

@@ -46,8 +46,14 @@ impl<'a> QueryBuilderOps<'a> for DeleteQueryBuilder<'a> {
     }
 
     #[inline]
-    fn r#where<Z: FieldValueIdentifier>(mut self, r#where: &'a Z, op: Comp) -> Self {
-        self._inner.r#where(r#where, op);
+    fn r#where(mut self, column_name: &'a str, operator: Comp, value: &'a dyn QueryParameter) -> Self {
+        self._inner.r#where(column_name, operator, value);
+        self
+    }
+
+    #[inline]
+    fn where_value<Z: FieldValueIdentifier>(mut self, r#where: &'a Z, op: Comp) -> Self {
+        self._inner.where_value(r#where, op);
         self
     }
 

canyon_core/src/query/querybuilder/types/mod.rs

@@ -62,6 +62,12 @@ impl Display for TableMetadata {
     }
 }
 
+impl AsRef<str> for TableMetadata {
+    fn as_ref(&self) -> &str {
+        self.schema.as_ref().unwrap()
+    }
+}
+
 pub struct ConditionClause<'a> {
     // TODO: where are missing complex where usages, like in joins, so we should consider to add the table
     // to the column like where table.column = ...