v0.1.1 (#35)

TheRustifyer · gbm25 · web-flow · commit e80094ebe213 · 2023-03-21T11:35:22.000+01:00
* Fixed nullability on migrations process (#34) * Fixed nullability on migrations process * Fixed format * Adding more types to the supported ones in the row mapper for tiberius * v0.1.1 * Refreshing and updating the GitHub actions for the project * Continuous integration runs only on main/develop. Upgrading the release action to its v2, and setting up it's content to directly publish the workspace * Adding a 15000ms of waiting between publishing every package in the release action --------- Co-authored-by: Gonzalo Busto Musi <35508741+gbm25@users.noreply.github.com> Co-authored-by: Alex Vergara <pyzyryab@tutanota.com>
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -1,8 +1,7 @@
-name: Linux CI
+name: Code Coverage
 
 on:
   push:
-    branches: 'development'
     tags:        
       - 'v[0-9]+.[0-9]+.[0-9]+'
       - 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -2,9 +2,9 @@ name: Continuous Integration
 
 on:
   push:
-    branches: '*'
+    branches: ['main', 'development']
   pull_request:
-    branches: '*'
+    branches: ['main', 'development']
 
 env:
   CARGO_TERM_COLOR: always
@@ -49,5 +49,6 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo test --verbose --workspace --all-features --no-fail-fast -- --show-output --test-threads=1
 
-      - name: Run UNIT tests with no external connections for the rest of the defined targets
+      - name: Run only UNIT tests for the rest of the defined targets
+        if: ${{ matrix.os != 'ubuntu-latest' }}
         run: cargo test --verbose --workspace --exclude tests --all-features --no-fail-fast -- --show-output
diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,30 +21,10 @@ jobs:
           toolchain: stable
           override: true
 
-      - uses: katyo/publish-crates@v1
+      - uses: katyo/publish-crates@v2
         with:
           registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          path: './canyon_connection'
-
-      - uses: katyo/publish-crates@v1
-        with:
-          registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          path: './canyon_crud'
-
-      - uses: katyo/publish-crates@v1
-        with:
-          registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          path: './canyon_observer'
-
-      - uses: katyo/publish-crates@v1
-        with:
-          registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          path: './canyon_macros'
-
-      - uses: katyo/publish-crates@v1
-        with:
-          registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-          path: './canyon_sql'
+          publish-delay: 15000
 
   release-publisher:
     needs: 'publish'
diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ Year format is defined as: `YYYY-m-d`
 
 ## [Unreleased]
 
+## [0.1.1] - 2023 - 03 - 20
+
+### Fix
+
+- Adding more types to the supported ones for Tiberius in the row mapper
+
 ## [0.1.0] - 2022 - 12 - 25
 
 ### Added
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@
 **A full written in `Rust` ORM for multiple databases.**
 
 - ![crates.io](https://img.shields.io/crates/v/canyon_sql.svg)
+- [![Continuous Integration](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/continuous-integration.yml)
+- [![Code Quality](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-quality.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-quality.yml)
 - [![Code Coverage Measure](https://zerodaycode.github.io/Canyon-SQL/badges/flat.svg)](https://zerodaycode.github.io/Canyon-SQL)
-- [![Linux CI](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-coverage.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-coverage.yml)
-- [![Tests on macOS](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/macos-tests.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/macos-tests.yml)
-- [![Tests on Windows](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/windows-tests.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/windows-tests.yml)
+- [![Code Coverage Status](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-coverage.yml/badge.svg)](https://github.com/zerodaycode/Canyon-SQL/actions/workflows/code-coverage.yml)
 
 `Canyon-SQL` is a high level abstraction for working with multiple databases concurrently. Is build on top of the `async` language features
 to provide a high speed, high performant library to handling data access for consumers.
diff --git a/canyon_connection/Cargo.toml b/canyon_connection/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "canyon_connection"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"
diff --git a/canyon_crud/Cargo.toml b/canyon_crud/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "canyon_crud"
-version = "0.1.0"
+version = "0.1.1"
 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.0", path = "../canyon_connection" }
+canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
diff --git a/canyon_macros/Cargo.toml b/canyon_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "canyon_macros"
-version = "0.1.0"
+version = "0.1.1"
 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.0", path = "../canyon_observer" }
-canyon_crud = { version = "0.1.0", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.0", path = "../canyon_connection" }
+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" }
diff --git a/canyon_macros/src/lib.rs b/canyon_macros/src/lib.rs
@@ -143,7 +143,7 @@ pub fn canyon_tokio_test(
 }
 
 /// Generates the enums that contains the `TypeFields` and `TypeFieldsValues`
-/// that the querybuilder requires for construct its queries
+/// that the query-builder requires for construct its queries
 #[proc_macro_derive(Fields)]
 pub fn querybuilder_fields(input: CompilerTokenStream) -> CompilerTokenStream {
     let entity_res = syn::parse::<CanyonEntity>(input);
@@ -472,7 +472,7 @@ pub fn implement_foreignkeyable_for_type(
     let ast: DeriveInput = syn::parse(input).unwrap();
     let ty = ast.ident;
 
-    // Recovers the identifiers of the struct's members
+    // Recovers the identifiers of the structs members
     let fields = filter_fields(match ast.data {
         syn::Data::Struct(ref s) => &s.fields,
         _ => {
@@ -519,7 +519,7 @@ pub fn implement_row_mapper_for_type(input: proc_macro::TokenStream) -> proc_mac
     // Gets the data from the AST
     let ast: DeriveInput = syn::parse(input).unwrap();
 
-    // Recovers the identifiers of the struct's members
+    // Recovers the identifiers of the structs members
     let fields = fields_with_types(match ast.data {
         syn::Data::Struct(ref s) => &s.fields,
         _ => {
@@ -539,6 +539,7 @@ pub fn implement_row_mapper_for_type(input: proc_macro::TokenStream) -> proc_mac
         }
     });
 
+    // TODO rework this ugly piece of code in the upcoming versions
     let init_field_values_sqlserver = fields.iter().map(|(_vis, ident, ty)| {
         let ident_name = ident.to_string();
 
@@ -552,6 +553,14 @@ pub fn implement_row_mapper_for_type(input: proc_macro::TokenStream) -> proc_mac
             quote! {
                 #ident: row.get::<i64, &str>(#ident_name)
             }
+        } else if get_field_type_as_string(ty).replace(' ', "") == "Option<i32>" {
+            quote! {
+                #ident: row.get::<i32, &str>(#ident_name)
+            }
+        } else if get_field_type_as_string(ty).replace(' ', "") == "Option<i16>" {
+            quote! {
+                #ident: row.get::<i16, &str>(#ident_name)
+            }
         } else if get_field_type_as_string(ty).replace(' ', "") == "Option<f32>" {
             quote! {
                 #ident: row.get::<f32, &str>(#ident_name)
diff --git a/canyon_observer/Cargo.toml b/canyon_observer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "canyon_observer"
-version = "0.1.0"
+version = "0.1.1"
 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.0", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.0", path = "../canyon_connection" }
+canyon_crud = { version = "0.1.1", path = "../canyon_crud" }
+canyon_connection = { version = "0.1.1", path = "../canyon_connection" }
diff --git a/canyon_observer/src/migrations/processor.rs b/canyon_observer/src/migrations/processor.rs
@@ -200,7 +200,7 @@ impl MigrationsProcessor {
         }
     }
 
-    // Creates or modify (currently only datatype) a column for a given canyon register entity field
+    // Creates or modify (currently only datatype and nullability) a column for a given canyon register entity field
     fn create_or_modify_field(
         &mut self,
         entity_name: &str,
@@ -211,13 +211,29 @@ impl MigrationsProcessor {
         // If we do not retrieve data for this database column, it does not exist yet
         // and therefore it has to be created
         if current_column_metadata.is_none() {
-            self.create_column(entity_name.to_string(), canyon_register_entity_field)
+            self.create_column(
+                entity_name.to_string(),
+                canyon_register_entity_field.clone(),
+            )
         } else if !MigrationsHelper::is_same_datatype(
             db_type,
             &canyon_register_entity_field,
             current_column_metadata.unwrap(),
         ) {
-            self.change_column_datatype(entity_name.to_string(), canyon_register_entity_field)
+            self.change_column_datatype(
+                entity_name.to_string(),
+                canyon_register_entity_field.clone(),
+            )
+        }
+
+        if let Some(column_metadata) = current_column_metadata {
+            if canyon_register_entity_field.is_nullable() != column_metadata.is_nullable {
+                if column_metadata.is_nullable {
+                    self.set_not_null(entity_name.to_string(), canyon_register_entity_field)
+                } else {
+                    self.drop_not_null(entity_name.to_string(), canyon_register_entity_field)
+                }
+            }
         }
     }
 
@@ -254,6 +270,20 @@ impl MigrationsProcessor {
             )));
     }
 
+    fn set_not_null(&mut self, table_name: String, field: CanyonRegisterEntityField) {
+        self.operations
+            .push(Box::new(ColumnOperation::AlterColumnSetNotNull(
+                table_name, field,
+            )));
+    }
+
+    fn drop_not_null(&mut self, table_name: String, field: CanyonRegisterEntityField) {
+        self.operations
+            .push(Box::new(ColumnOperation::AlterColumnDropNotNull(
+                table_name, field,
+            )));
+    }
+
     fn add_constraints(
         &mut self,
         entity_name: &str,
@@ -555,7 +585,7 @@ impl MigrationsHelper {
             .iter()
             .any(|v| v.table_name.to_lowercase() == entity_name.to_lowercase())
     }
-    // Get the table metadata for a given entity name or his old entity name if the table was renamed.
+    /// Get the table metadata for a given entity name or his old entity name if the table was renamed.
     fn get_current_table_metadata<'a>(
         canyon_memory: &'_ CanyonMemory,
         entity_name: &'a str,
@@ -575,7 +605,7 @@ impl MigrationsHelper {
             .map(|e| e.to_owned())
     }
 
-    // Get the column metadata for a given column name
+    /// Get the column metadata for a given column name
     fn get_current_column_metadata(
         column_name: String,
         current_table_metadata: Option<&TableMetadata>,
diff --git a/canyon_observer/src/migrations/register_types.rs b/canyon_observer/src/migrations/register_types.rs
@@ -262,4 +262,9 @@ impl CanyonRegisterEntityField {
 
         numeric.contains(&self.field_type.as_str()) && pk_is_autoincremental
     }
+
+    /// Return the nullability of a the field
+    pub fn is_nullable(&self) -> bool {
+        self.field_type.to_uppercase().starts_with("OPTION")
+    }
 }
diff --git a/canyon_sql/Cargo.toml b/canyon_sql/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "canyon_sql"
-version = "0.1.0"
+version = "0.1.1"
 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.0", path = "../canyon_macros" }
-canyon_observer = { version = "0.1.0", path = "../canyon_observer" }
-canyon_crud = { version = "0.1.0", path = "../canyon_crud" }
-canyon_connection = { version = "0.1.0", path = "../canyon_connection" }
+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" }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tests"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 publish = false
 
