From e758e670e6c82db8a661d85448d2befafff6f7a4 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 18 Nov 2024 06:13:49 +0100 Subject: [PATCH] Rename `acrate-core` to `acrate_database` --- .idea/acrate.iml | 2 +- .idea/sqldialects.xml | 2 +- Cargo.toml | 2 +- acrate-webfinger/Cargo.toml | 2 +- acrate-webfinger/src/route.rs | 6 +++--- {acrate-core => acrate_database}/Cargo.toml | 4 ++-- {acrate-core => acrate_database}/diesel.toml | 0 .../0000-00-00-000000_diesel_initial_setup/down.sql | 0 .../0000-00-00-000000_diesel_initial_setup/up.sql | 0 .../migrations/2024-11-14-031744_meta/down.sql | 0 .../migrations/2024-11-14-031744_meta/up.sql | 0 {acrate-core => acrate_database}/src/lib.rs | 0 {acrate-core => acrate_database}/src/meta.rs | 0 {acrate-core => acrate_database}/src/schema.rs | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename {acrate-core => acrate_database}/Cargo.toml (85%) rename {acrate-core => acrate_database}/diesel.toml (100%) rename {acrate-core => acrate_database}/migrations/0000-00-00-000000_diesel_initial_setup/down.sql (100%) rename {acrate-core => acrate_database}/migrations/0000-00-00-000000_diesel_initial_setup/up.sql (100%) rename {acrate-core => acrate_database}/migrations/2024-11-14-031744_meta/down.sql (100%) rename {acrate-core => acrate_database}/migrations/2024-11-14-031744_meta/up.sql (100%) rename {acrate-core => acrate_database}/src/lib.rs (100%) rename {acrate-core => acrate_database}/src/meta.rs (100%) rename {acrate-core => acrate_database}/src/schema.rs (100%) diff --git a/.idea/acrate.iml b/.idea/acrate.iml index 32d223d..48f40e0 100644 --- a/.idea/acrate.iml +++ b/.idea/acrate.iml @@ -3,13 +3,13 @@ - + diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index 4495f93..6447d3b 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 357abb7..96cfab2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver = "2" -members = ["acrate-core", "acrate-hostmeta", "acrate-inbox", "acrate-nodeinfo", "acrate-webfinger"] +members = ["acrate_database", "acrate-hostmeta", "acrate-inbox", "acrate-nodeinfo", "acrate-webfinger"] diff --git a/acrate-webfinger/Cargo.toml b/acrate-webfinger/Cargo.toml index cfd73d0..c6983f1 100644 --- a/acrate-webfinger/Cargo.toml +++ b/acrate-webfinger/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -acrate-core = { path = "../acrate-core" } +acrate_database = { path = "../acrate_database" } acrate-hostmeta = { path = "../acrate-hostmeta" } anyhow = "1.0.93" axum = { version = "0.7.7", features = ["macros"] } diff --git a/acrate-webfinger/src/route.rs b/acrate-webfinger/src/route.rs index 3c51847..bda54ad 100644 --- a/acrate-webfinger/src/route.rs +++ b/acrate-webfinger/src/route.rs @@ -3,9 +3,9 @@ use axum::Extension; use axum::http::{HeaderMap, Response, StatusCode}; use axum_extra::extract::Query; use serde::Deserialize; -use acrate_core::diesel::GroupedBy; -use acrate_core::diesel_async::{AsyncConnection, AsyncPgConnection}; -use acrate_core::meta::{MetaAlias, MetaLink, MetaLinkProperty, MetaLinkTitle, MetaProperty, MetaSubject}; +use acrate_database::diesel::GroupedBy; +use acrate_database::diesel_async::{AsyncConnection, AsyncPgConnection}; +use acrate_database::meta::{MetaAlias, MetaLink, MetaLinkProperty, MetaLinkTitle, MetaProperty, MetaSubject}; use acrate_hostmeta::jrd::ResourceDescriptorLinkJRD; use acrate_hostmeta::xrd::{ResourceDescriptorLinkXRD, ResourceDescriptorPropertyXRD, ResourceDescriptorTitleXRD}; use crate::config; diff --git a/acrate-core/Cargo.toml b/acrate_database/Cargo.toml similarity index 85% rename from acrate-core/Cargo.toml rename to acrate_database/Cargo.toml index d5b738a..89234c4 100644 --- a/acrate-core/Cargo.toml +++ b/acrate_database/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "acrate-core" -version = "0.1.0" +name = "acrate_database" +version = "0.2.0" edition = "2021" [dependencies] diff --git a/acrate-core/diesel.toml b/acrate_database/diesel.toml similarity index 100% rename from acrate-core/diesel.toml rename to acrate_database/diesel.toml diff --git a/acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/down.sql b/acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/down.sql similarity index 100% rename from acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/down.sql rename to acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/down.sql diff --git a/acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/up.sql b/acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/up.sql similarity index 100% rename from acrate-core/migrations/0000-00-00-000000_diesel_initial_setup/up.sql rename to acrate_database/migrations/0000-00-00-000000_diesel_initial_setup/up.sql diff --git a/acrate-core/migrations/2024-11-14-031744_meta/down.sql b/acrate_database/migrations/2024-11-14-031744_meta/down.sql similarity index 100% rename from acrate-core/migrations/2024-11-14-031744_meta/down.sql rename to acrate_database/migrations/2024-11-14-031744_meta/down.sql diff --git a/acrate-core/migrations/2024-11-14-031744_meta/up.sql b/acrate_database/migrations/2024-11-14-031744_meta/up.sql similarity index 100% rename from acrate-core/migrations/2024-11-14-031744_meta/up.sql rename to acrate_database/migrations/2024-11-14-031744_meta/up.sql diff --git a/acrate-core/src/lib.rs b/acrate_database/src/lib.rs similarity index 100% rename from acrate-core/src/lib.rs rename to acrate_database/src/lib.rs diff --git a/acrate-core/src/meta.rs b/acrate_database/src/meta.rs similarity index 100% rename from acrate-core/src/meta.rs rename to acrate_database/src/meta.rs diff --git a/acrate-core/src/schema.rs b/acrate_database/src/schema.rs similarity index 100% rename from acrate-core/src/schema.rs rename to acrate_database/src/schema.rs