General Refactor

.github/workflows/code-quality.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        crate: [canyon_connection, canyon_crud, canyon_macros, canyon_migrations]
+        crate: [canyon_core, canyon_crud, canyon_macros, canyon_entities, canyon_migrations]
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Generate Canyon-SQL release
 
 on:
   push:
-    tags:        
+    tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
       - 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
 

.gitignore

@@ -4,6 +4,5 @@ Cargo.lock
 /tester_canyon_sql/
 canyon_tester/
 macro_utils.rs
-.vscode/
 postgres-data/
 mysql-data/

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "rust-analyzer.cargo.features": ["postgres, mssql, mysql, migrations"],
+    "rust-analyzer.check.workspace": true,
+    "rust-analyzer.cargo.buildScripts.enable": true,
+    "rust-analyzer.procMacro.enable": true,
+    "rust-analyzer.diagnostics.disabled": ["unresolved-proc-macro"],
+    "rust-analyzer.linkedProjects": [
+        "./Cargo.toml"
+    ]
+  }
+

Cargo.toml

@@ -11,17 +11,17 @@ description.workspace = true
 
 [workspace]
 members = [
-    "canyon_connection",
+    "canyon_core",
     "canyon_crud",
     "canyon_entities",
     "canyon_migrations",
     "canyon_macros",
-    "tests"
+    "tests",
 ]
 
 [dependencies]
 # Project crates
-canyon_connection = { workspace = true }
+canyon_core = { workspace = true }
 canyon_crud = { workspace = true }
 canyon_entities = { workspace = true }
 canyon_migrations = { workspace = true, optional = true  }
@@ -35,28 +35,25 @@ mysql_common = { workspace = true, optional = true }
 
 
 [workspace.dependencies]
+canyon_core = { version = "0.5.1", path = "canyon_core" }
 canyon_crud = { version = "0.5.1", path = "canyon_crud" }
-canyon_connection = { version = "0.5.1", path = "canyon_connection" }
 canyon_entities = { version = "0.5.1", path = "canyon_entities" }
 canyon_migrations = { version = "0.5.1", path = "canyon_migrations"}
 canyon_macros = { version = "0.5.1", path = "canyon_macros" }
 
 tokio = { version = "1.27.0", features = ["full"]  }
 tokio-util = { version = "0.7.4", features = ["compat"]  }
 tokio-postgres = { version = "0.7.2", features = ["with-chrono-0_4"] }
-tiberius = { version = "0.12.1", features = ["tds73", "chrono", "integrated-auth-gssapi"] }
-mysql_async = { version = "0.32.2" }
-mysql_common = { version = "0.30.6", features = [ "chrono" ]}
+tiberius = { version = "0.12.3", features = ["tds73", "chrono", "integrated-auth-gssapi"] }
+mysql_async = { version = "0.36.1" }
+mysql_common = { version = "0.35.4", features = [ "chrono" ]}
 
 chrono = { version = "0.4", features = ["serde"] }  # Just from TP better?
 serde = { version = "1.0.138", features = ["derive"] }
 
 futures = "0.3.25"
-indexmap = "1.9.1"
 async-std = "1.12.0"
-lazy_static = "1.4.0"
 toml = "0.7.3"
-async-trait = "0.1.68"
 walkdir = "2.3.3"
 regex = "1.9.3"
 partialdebug = "0.2.0"
@@ -66,16 +63,16 @@ proc-macro2 = "1.0.27"
 
 [workspace.package]
 version = "0.5.1"
-edition = "2021"
-authors = ["Alex Vergara<[email protected]>, Gonzalo Busto Musi<[email protected]>"]
+edition = "2024"
+authors = ["Alex Vergara<[email protected]>, Gonzalo Busto Musi<[email protected]>"]
 documentation = "https://zerodaycode.github.io/canyon-book/"
 homepage = "https://github.com/zerodaycode/Canyon-SQL"
 readme = "README.md"
 license = "MIT"
 description = "A Rust ORM and QueryBuilder"
 
 [features]
-postgres =   ["tokio-postgres",    "canyon_connection/postgres", "canyon_crud/postgres",    "canyon_migrations/postgres", "canyon_macros/postgres"]
-mssql =      ["tiberius",          "canyon_connection/mssql",    "canyon_crud/mssql",       "canyon_migrations/mssql",    "canyon_macros/mssql"]
-mysql =      ["mysql_async",       "mysql_common",               "canyon_connection/mysql", "canyon_crud/mysql",          "canyon_migrations/mysql", "canyon_macros/mysql"]
+postgres =   ["tokio-postgres",                 "canyon_core/postgres",  "canyon_crud/postgres", "canyon_migrations/postgres", "canyon_macros/postgres"]
+mssql =      ["tiberius",                       "canyon_core/mssql",     "canyon_crud/mssql",    "canyon_migrations/mssql",    "canyon_macros/mssql"]
+mysql =      ["mysql_async", "mysql_common",    "canyon_core/mysql",     "canyon_crud/mysql",    "canyon_migrations/mysql",    "canyon_macros/mysql"]
 migrations = ["canyon_migrations", "canyon_macros/migrations"]

README.md

@@ -84,7 +84,7 @@ assert_eq!(
 );
 ```
 
-Note the leading reference on the `find_by_pk(...)` parameter. This associated function receives an `&dyn QueryParameter<'_>` as argument, not a value.
+Note the leading reference on the `find_by_pk(...)` parameter. This associated function receives an `&dyn QueryParameter` as argument, not a value.
 
 ### :wrench: Building more complex queries
 

bash_aliases.sh

@@ -14,6 +14,10 @@ alias DockerDown='docker-compose -f ./docker/docker-compose.yml down'
 # Cleans the generated cache folder for the postgres in the docker
 alias CleanPostgres='rm -rf ./docker/postgres-data'
 
+# Code Quality
+alias Clippy='cargo clippy --all-targets --all-features --workspace -- -D warnings'
+alias Fmt='cargo fmt --all -- --check'
+
 # Build the project for Windows targets
 alias BuildCanyonWin='cargo build --all-features --target=x86_64-pc-windows-msvc'
 alias BuildCanyonWinFull='cargo clean && cargo build --all-features --target=x86_64-pc-windows-msvc'
@@ -37,10 +41,11 @@ alias IntegrationTestsLinux='cargo test --all-features --no-fail-fast -p tests -
 alias ITIncludeIgnoredLinux='cargo test --all-features --no-fail-fast -p tests --target=x86_64-unknown-linux-gnu -- --show-output --test-threads=1 --nocapture --test-threads=1 --include-ignored'
 alias SqlServerInitializationLinux='cargo test initialize_sql_server_docker_instance -p tests --all-features --no-fail-fast --target=x86_64-unknown-linux-gnu -- --show-output --test-threads=1 --nocapture --include-ignored'
 
-
+# -----
 # Publish Canyon-SQL to the registry with its dependencies
 alias PublishCanyon='cargo publish -p canyon_connection && cargo publish -p canyon_crud && cargo publish -p canyon_migrations && cargo publish -p canyon_macros && cargo publish -p canyon_sql_root'
 
+# -----
 # Collects the code coverage for the project (tests must run before this)
 alias CcEnvVars='export CARGO_INCREMENTAL=0
 export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"