#feature Implemented bool types for QueryParameter<'_>. Upgraded to v0.1.2

Author: TheRustifyer

CHANGELOG.md

@@ -9,14 +9,6 @@ Year format is defined as: `YYYY-m-d`
 
 ## [Unreleased]
 
-## [0.1.2] - 2023 - 03 - 23
-
-### Update
-
-- Removed from `postgresql` migrations the auto conversion to lowercase of the table and column names
-
-### Fix
-
 - Solved a bug in the canyon_entity proc macro that was wiring the incorrect user table name in the migrations
 
 ## [0.1.1] - 2023 - 03 - 20

canyon_connection/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "canyon_connection"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"

canyon_crud/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "canyon_crud"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"
@@ -12,4 +12,4 @@ description = "A Rust ORM and QueryBuilder"
 chrono = { version = "0.4", features = ["serde"] }
 async-trait = { version = "0.1.50" }
 
-canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
+canyon_connection = { version = "0.1.2", path = "../canyon_connection" }

canyon_crud/src/bounds.rs

@@ -237,6 +237,15 @@ impl<'a> IntoSql<'a> for &'a dyn QueryParameter<'a> {
     }
 }
 
+impl<'a> QueryParameter<'a> for bool {
+    fn as_postgres_param(&self) -> &(dyn ToSql + Sync) {
+        self
+    }
+
+    fn as_sqlserver_param(&self) -> ColumnData<'_> {
+        ColumnData::Bit(Some(*self))
+    }
+}
 impl<'a> QueryParameter<'a> for i16 {
     fn as_postgres_param(&self) -> &(dyn ToSql + Sync) {
         self

canyon_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "canyon_macros"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"
@@ -18,6 +18,6 @@ proc-macro2 = "1.0.27"
 futures = "0.3.21"
 tokio = { version = "1.9.0", features = ["full"] }
 
-canyon_observer = { version = "0.1.1", path = "../canyon_observer" }
-canyon_crud = { version = "0.1.1", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
+canyon_observer = { version = "0.1.2", path = "../canyon_observer" }
+canyon_crud = { version = "0.1.2", path = "../canyon_crud" }
+canyon_connection = { version = "0.1.2", path = "../canyon_connection" }

canyon_macros/src/canyon_macro.rs

@@ -5,7 +5,7 @@ use proc_macro2::{Ident, TokenStream};
 
 use quote::quote;
 
-use canyon_observer::{QUERIES_TO_EXECUTE, CM_QUERIES_TO_EXECUTE};
+use canyon_observer::{CM_QUERIES_TO_EXECUTE, QUERIES_TO_EXECUTE};
 use syn::{Lit, NestedMeta};
 
 #[derive(Debug)]
@@ -109,7 +109,7 @@ fn report_literals_not_allowed(ident: &str, s: &Lit) -> TokenStream1 {
 pub fn wire_queries_to_execute(canyon_manager_tokens: &mut Vec<TokenStream>) {
     let cm_data = CM_QUERIES_TO_EXECUTE.lock().unwrap();
     let data = QUERIES_TO_EXECUTE.lock().unwrap();
-    
+
     let cm_data_to_wire = cm_data.iter().map(|(key, value)| {
         quote! { cm_hm.insert(#key, vec![#(#value),*]); }
     });
@@ -123,10 +123,10 @@ pub fn wire_queries_to_execute(canyon_manager_tokens: &mut Vec<TokenStream>) {
 
         let mut cm_hm: HashMap<&str, Vec<&str>> = HashMap::new();
         let mut hm: HashMap<&str, Vec<&str>> = HashMap::new();
-        
+
         #(#cm_data_to_wire)*;
         #(#data_to_wire)*;
-        
+
         MigrationsProcessor::from_query_register(&cm_hm).await;
         MigrationsProcessor::from_query_register(&hm).await;
     };

canyon_observer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "canyon_observer"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"
@@ -23,5 +23,5 @@ quote = "1.0.9"
 partialdebug = "0.2.0"
 
 # Internal dependencies
-canyon_crud = { version = "0.1.1", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
+canyon_crud = { version = "0.1.2", path = "../canyon_crud" }
+canyon_connection = { version = "0.1.2", path = "../canyon_connection" }

canyon_observer/src/lib.rs

@@ -25,7 +25,6 @@ pub static CANYON_REGISTER_ENTITIES: Mutex<Vec<CanyonRegisterEntity<'static>>> =
 lazy_static! {
     pub static ref QUERIES_TO_EXECUTE: Mutex<HashMap<&'static str, Vec<String>>> =
         Mutex::new(HashMap::new());
-
     pub static ref CM_QUERIES_TO_EXECUTE: Mutex<HashMap<&'static str, Vec<String>>> =
         Mutex::new(HashMap::new());
 }

canyon_observer/src/migrations/memory.rs

@@ -61,7 +61,7 @@ impl CanyonMemory {
     #[allow(clippy::nonminimal_bool)]
     pub async fn remember(
         datasource: &DatasourceConfig<'static>,
-        canyon_entities: &Vec<CanyonRegisterEntity<'_>>,
+        canyon_entities: &[CanyonRegisterEntity<'_>],
     ) -> Self {
         // Creates the memory table if not exists
         Self::create_memory(datasource.name, &datasource.properties.db_type).await;
@@ -90,18 +90,24 @@ impl CanyonMemory {
             renamed_entities: HashMap::new(),
         };
         Self::find_canyon_entity_annotated_structs(&mut mem, canyon_entities).await;
-        
+
         let mut updates = Vec::new();
 
-        for _struct in &mem.memory { // For every program entity detected
-            let already_in_db = db_rows.iter().find(|el|
-                el.filepath == _struct.filepath || el.struct_name == _struct.struct_name || el.declared_table_name == _struct.declared_table_name
-            );
+        for _struct in &mem.memory {
+            // For every program entity detected
+            let already_in_db = db_rows.iter().find(|el| {
+                el.filepath == _struct.filepath
+                    || el.struct_name == _struct.struct_name
+                    || el.declared_table_name == _struct.declared_table_name
+            });
 
             if let Some(old) = already_in_db {
-                if !(old.filepath == _struct.filepath && old.struct_name == _struct.struct_name && old.declared_table_name == _struct.declared_table_name) {
+                if !(old.filepath == _struct.filepath
+                    && old.struct_name == _struct.struct_name
+                    && old.declared_table_name == _struct.declared_table_name)
+                {
                     updates.push(old.struct_name);
-                let stmt = format!(
+                    let stmt = format!(
                         "UPDATE canyon_memory SET filepath = '{}', struct_name = '{}', declared_table_name = '{}' \
                                 WHERE id = {}",
                         _struct.filepath, _struct.struct_name, _struct.declared_table_name, old.id
@@ -121,7 +127,6 @@ impl CanyonMemory {
             }
 
             if already_in_db.is_none() {
-                println!("\tInsert action for: {_struct:?}");
                 let stmt = format!(
                     "INSERT INTO canyon_memory (filepath, struct_name, declared_table_name) \
                         VALUES ('{}', '{}', '{}')",
@@ -139,7 +144,13 @@ impl CanyonMemory {
                 .any(|entity| entity.struct_name == db_row.struct_name)
                 && !updates.contains(&db_row.struct_name)
             {
-                save_canyon_memory_query(format!("DELETE FROM canyon_memory WHERE struct_name = '{}'", db_row.struct_name), datasource.name);
+                save_canyon_memory_query(
+                    format!(
+                        "DELETE FROM canyon_memory WHERE struct_name = '{}'",
+                        db_row.struct_name
+                    ),
+                    datasource.name,
+                );
             }
         }
         mem
@@ -219,15 +230,10 @@ impl CanyonMemory {
     }
 }
 
-
-fn save_canyon_memory_query<'a>(stmt: String, ds_name: &'static str) {
+fn save_canyon_memory_query(stmt: String, ds_name: &'static str) {
     use crate::CM_QUERIES_TO_EXECUTE;
 
-    if CM_QUERIES_TO_EXECUTE
-        .lock()
-        .unwrap()
-        .contains_key(ds_name)
-    {
+    if CM_QUERIES_TO_EXECUTE.lock().unwrap().contains_key(ds_name) {
         CM_QUERIES_TO_EXECUTE
             .lock()
             .unwrap()
@@ -240,7 +246,7 @@ fn save_canyon_memory_query<'a>(stmt: String, ds_name: &'static str) {
             .unwrap()
             .insert(ds_name, vec![stmt]);
     }
-} 
+}
 
 /// Represents a single row from the `canyon_memory` table
 #[derive(Debug)]

canyon_sql/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "canyon_sql"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["Alex Vergara<pyzyryab@tutanota.com>, Gonzalo Busto<gbm25@gmail.com>"]
 documentation = "https://zerodaycode.github.io/canyon-book/"
@@ -13,7 +13,7 @@ description = "A Rust ORM and QueryBuilder"
 async-trait = { version = "0.1.50" }
 
 # Project crates
-canyon_macros = { version = "0.1.1", path = "../canyon_macros" }
-canyon_observer = { version = "0.1.1", path = "../canyon_observer" }
-canyon_crud = { version = "0.1.1", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
+canyon_macros = { version = "0.1.2", path = "../canyon_macros" }
+canyon_observer = { version = "0.1.2", path = "../canyon_observer" }
+canyon_crud = { version = "0.1.2", path = "../canyon_crud" }
+canyon_connection = { version = "0.1.2", path = "../canyon_connection" }