Skip to content

Commit af89640

Browse files
committed
Creating feature "migrations".
Changed "canyon_observer" to "canyon_migrations"
1 parent f470c2a commit af89640

23 files changed

+21
-19
lines changed

.github/workflows/code-quality.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
crate: [canyon_connection, canyon_crud, canyon_macros, canyon_observer]
58+
crate: [canyon_connection, canyon_crud, canyon_macros, canyon_migrations]
5959
steps:
6060
- uses: actions/checkout@v3
6161

Cargo.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description.workspace = true
1313
members = [
1414
"canyon_connection",
1515
"canyon_crud",
16-
"canyon_observer",
16+
"canyon_migrations",
1717
"canyon_macros",
1818

1919
"tests"
@@ -23,7 +23,7 @@ members = [
2323
# Project crates
2424
canyon_connection = { workspace = true, path = "canyon_connection" }
2525
canyon_crud = { workspace = true, path = "canyon_crud" }
26-
canyon_observer = { workspace = true, path = "canyon_observer" }
26+
canyon_migrations = { workspace = true, path = "canyon_migrations", optional = true }
2727
canyon_macros = { workspace = true, path = "canyon_macros" }
2828

2929
# To be marked as opt deps
@@ -33,7 +33,7 @@ tiberius = { workspace = true, optional = true }
3333
[workspace.dependencies]
3434
canyon_crud = { version = "0.3.1", path = "canyon_crud" }
3535
canyon_connection = { version = "0.3.1", path = "canyon_connection" }
36-
canyon_observer = { version = "0.3.1", path = "canyon_observer" }
36+
canyon_migrations = { version = "0.3.1", path = "canyon_migrations"}
3737
canyon_macros = { version = "0.3.1", path = "canyon_macros" }
3838

3939
tokio = { version = "1.27.0", features = ["full"] }
@@ -59,13 +59,14 @@ proc-macro2 = "1.0.27"
5959
[workspace.package]
6060
version = "0.3.1"
6161
edition = "2021"
62-
authors = ["Alex Vergara<[email protected]>, Gonzalo Busto<gbm25@gmail.com>"]
62+
authors = ["Alex Vergara<[email protected]>, Gonzalo Busto Musi<gonzalo.busto@gmail.com>"]
6363
documentation = "https://zerodaycode.github.io/canyon-book/"
6464
homepage = "https://github.com/zerodaycode/Canyon-SQL"
6565
readme = "README.md"
6666
license = "MIT"
6767
description = "A Rust ORM and QueryBuilder"
6868

6969
[features]
70-
postgres = ["tokio-postgres", "canyon_connection/postgres", "canyon_crud/postgres", "canyon_observer/postgres", "canyon_macros/postgres"]
71-
mssql = ["tiberius", "canyon_connection/mssql", "canyon_crud/mssql", "canyon_observer/mssql", "canyon_macros/mssql"]
70+
postgres = ["tokio-postgres", "canyon_connection/postgres", "canyon_crud/postgres", "canyon_migrations/postgres", "canyon_macros/postgres"]
71+
mssql = ["tiberius", "canyon_connection/mssql", "canyon_crud/mssql", "canyon_migrations/mssql", "canyon_macros/mssql"]
72+
migrations = ["canyon_migrations"]

bash_aliases.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ alias SqlServerInitializationLinux='cargo test initialize_sql_server_docker_inst
3939

4040

4141
# Publish Canyon-SQL to the registry with its dependencies
42-
alias PublishCanyon='cargo publish -p canyon_connection && cargo publish -p canyon_crud && cargo publish -p canyon_observer && cargo publish -p canyon_macros && cargo publish -p canyon_sql_root'
42+
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'
4343

4444
# Collects the code coverage for the project (tests must run before this)
4545
alias CcEnvVars='export CARGO_INCREMENTAL=0

canyon_macros/Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ proc-macro2 = { workspace = true }
1919
futures = { workspace = true }
2020
tokio = { workspace = true }
2121

22-
canyon_observer = { workspace = true }
22+
canyon_migrations = { workspace = true, optional = true }
2323
canyon_crud = { workspace = true }
2424
canyon_connection = { workspace = true }
2525

2626
[features]
27-
postgres = ["canyon_connection/postgres", "canyon_crud/postgres", "canyon_observer/postgres"]
28-
mssql = ["canyon_connection/mssql", "canyon_crud/mssql", "canyon_observer/mssql"]
27+
postgres = ["canyon_connection/postgres", "canyon_crud/postgres", "canyon_migrations/postgres"]
28+
mssql = ["canyon_connection/mssql", "canyon_crud/mssql", "canyon_migrations/mssql"]
29+
migrations = ["canyon_migrations"]

canyon_macros/src/canyon_macro.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use proc_macro2::{Ident, TokenStream};
55

66
use quote::quote;
77

8-
use canyon_observer::{CM_QUERIES_TO_EXECUTE, QUERIES_TO_EXECUTE};
8+
use canyon_migrations::{CM_QUERIES_TO_EXECUTE, QUERIES_TO_EXECUTE};
99
use syn::{Lit, NestedMeta};
1010

1111
#[derive(Debug)]

canyon_macros/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use query_operations::{
2626
use canyon_macro::{parse_canyon_macro_attributes, wire_queries_to_execute};
2727
use utils::{function_parser::FunctionParser, helpers, macro_tokens::MacroTokens};
2828

29-
use canyon_observer::{
29+
use canyon_migrations::{
3030
manager::{
3131
entity::CanyonEntity,
3232
manager_builder::{
@@ -36,7 +36,7 @@ use canyon_observer::{
3636
migrations::handler::Migrations,
3737
};
3838

39-
use canyon_observer::{
39+
use canyon_migrations::{
4040
migrations::register_types::{CanyonRegisterEntity, CanyonRegisterEntityField},
4141
CANYON_REGISTER_ENTITIES,
4242
};

canyon_macros/src/query_operations/select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use canyon_observer::manager::field_annotation::EntityFieldAnnotation;
1+
use canyon_migrations::manager::field_annotation::EntityFieldAnnotation;
22

33
use proc_macro2::TokenStream;
44
use quote::quote;

canyon_macros/src/utils/macro_tokens.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::convert::TryFrom;
22

3-
use canyon_observer::manager::field_annotation::EntityFieldAnnotation;
3+
use canyon_migrations::manager::field_annotation::EntityFieldAnnotation;
44
use proc_macro2::Ident;
55
use syn::{Attribute, DeriveInput, Fields, Generics, Type, Visibility};
66

canyon_observer/Cargo.toml canyon_migrations/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "canyon_observer"
2+
name = "canyon_migrations"
33
version.workspace = true
44
edition.workspace = true
55
authors.workspace = true
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
extern crate canyon_connection;
77
extern crate canyon_crud;
88
extern crate canyon_macros;
9-
extern crate canyon_observer;
9+
extern crate canyon_migrations;
1010

1111
/// Reexported elements to the root of the public API
1212
pub mod migrations {
13-
pub use canyon_observer::migrations::{handler, processor};
13+
pub use canyon_migrations::migrations::{handler, processor};
1414
}
1515

1616
/// The top level reexport. Here we define the path to some really important

0 commit comments

Comments
 (0)