.idea/acrate.iml

@@ -11,7 +11,6 @@
       <sourceFolder url="file://$MODULE_DIR$/acrate_rd/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/acrate_mime/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/acrate_rdserver/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/acrate_database/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

acrate_database/Cargo.toml

@@ -21,9 +21,7 @@ pretty_env_logger = { version = "0.5.0", optional = true }
 uuid = "1.11.0"
 
 [features]
-default = ["connect"]
+bin = ["diesel_migrations", "micronfig", "pretty_env_logger"]
-bin = ["diesel_migrations", "pretty_env_logger", "connect"]
-connect = ["micronfig"]
 
 [lib]
 name = "acrate_database"

acrate_database/src/bin/acrate_database_migrate.rs

@@ -13,25 +13,38 @@
 //! 
 
 use std::process::exit;
-use diesel::PgConnection;
+use diesel::{Connection, PgConnection};
 use diesel_migrations::{EmbeddedMigrations, MigrationHarness};
-use acrate_database::connect::managed_connect_sync;
+
+mod config {
+	micronfig::config! {
+		ACRATE_DATABASE_DATABASE_URL: String,
+	}
+}
 
 pub const MIGRATIONS: EmbeddedMigrations = diesel_migrations::embed_migrations!();
 
-fn managed_run_migrations(mut db: PgConnection) {
-	log::debug!("Running migrations...");
-	if let Err(e) = db.run_pending_migrations(MIGRATIONS) {
-		log::error!("Failed to perform migration: {e:#?}");
-		exit(2);
-	};
-	log::info!("Migrations applied successfully!")
-}
-
 fn main() {
 	pretty_env_logger::init();
 	log::info!("Logging initialized successfully!");
 	
-	let db = managed_connect_sync();
+	log::trace!("Determining database URL...");
-	managed_run_migrations(db);
+	let db = config::ACRATE_DATABASE_DATABASE_URL();
+	
+	log::debug!("Connecting to: {db:?}");
+	let mut db = match PgConnection::establish(db) {
+		Err(e) => {
+			log::error!("Failed to connect to the PostgreSQL database: {e:#?}");
+			exit(1);
+		}
+		Ok(db) => db,
+	};
+	
+	log::debug!("Running migrations...");
+	if let Err(e) = db.run_pending_migrations(MIGRATIONS) {
+		log::error!("Failed to perform migration: {e:#?}");
+		exit(2);
+	};
+	
+	log::info!("Migrations applied successfully!")
 }

acrate_database/src/config.rs

@@ -1,5 +0,0 @@
-//! Configuration relative to the database that applies to all crates making use of it.
-
-micronfig::config! {
-	ACRATE_DATABASE_URL: String,
-}

acrate_database/src/connect.rs

@@ -1,51 +0,0 @@
-use diesel::{Connection, ConnectionResult, PgConnection};
-use diesel_async::{AsyncConnection, AsyncPgConnection};
-use crate::config;
-
-/// Create a [`PgConnection`] to the configured database.
-pub fn connect_sync() -> ConnectionResult<PgConnection> {
-	log::trace!("Determining the database URL for a sync connection...");
-	let database_url = config::ACRATE_DATABASE_URL();
-	
-	log::trace!("Establishing a sync connection to the database at: {database_url:?}");
-	PgConnection::establish(database_url)
-}
-
-/// Create an [`AsyncPgConnection`] to the configured database.
-pub async fn connect_async() -> ConnectionResult<AsyncPgConnection> {
-	log::trace!("Determining the database URL for an async connection...");
-	let database_url = config::ACRATE_DATABASE_URL();
-	
-	log::trace!("Establishing an async connection to the database at: {database_url:?}");
-	AsyncPgConnection::establish(database_url).await
-}
-
-/// Run [`connect_sync`], then handle errors by logging the error and exiting the process with `1`.
-pub fn managed_connect_sync() -> PgConnection {
-	log::trace!("Attempting a managed sync connection to the database...");
-	
-	match connect_sync() {
-		Err(e) => {
-			log::error!("Failed to connect to the database: {e:#?}");
-			std::process::exit(1);
-		},
-		Ok(conn) => {
-			conn
-		},
-	}
-}
-
-/// Run [`connect_async`], then handle errors by logging the error and exiting the process with `1`.
-pub async fn managed_connect_async() -> AsyncPgConnection {
-	log::trace!("Attempting a managed async connection to the database...");
-	
-	match connect_async().await {
-		Err(e) => {
-			log::error!("Failed to connect to the database: {e:#?}");
-			std::process::exit(1);
-		},
-		Ok(conn) => {
-			conn
-		},
-	}
-}

acrate_database/src/lib.rs

@@ -6,15 +6,7 @@
 mod schema;
 
 pub mod meta;
-
 mod macros;
 
-#[cfg(feature = "connect")]
-mod config;
-
-#[cfg(feature = "connect")]
-pub mod connect;
-
 pub use diesel;
-
 pub use diesel_async;

acrate_database/src/meta.rs

@@ -28,6 +28,7 @@
 
 use diesel::deserialize::FromSql;
 use diesel::{AsExpression, Associations, FromSqlRow, Identifiable, Insertable, IntoSql, PgTextExpressionMethods, QueryResult, Queryable, QueryableByName, Selectable, SelectableHelper, ExpressionMethods, BelongingToDsl};
+use diesel::dsl::insert_into;
 use diesel::pg::{Pg, PgConnection};
 use diesel::serialize::{Output, ToSql};
 use diesel_async::AsyncPgConnection;

acrate_rdserver/Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["jrd", "xrd", "hostmeta", "webfinger", "resource-descriptor"]
 categories = ["web-programming"]
 
 [dependencies]
-acrate_database = { path = "../acrate_database", features = ["connect"] }
+acrate_database = { path = "../acrate_database" }
 acrate_rd = { path = "../acrate_rd" }
 anyhow = "1.0.93"
 axum = { version = "0.7.7", features = ["macros"] }
@@ -27,4 +27,3 @@ mediatype = { version = "0.19.18", features = ["serde"] }
 
 [lints.clippy]
 tabs-in-doc-comments = "allow"
-type-complexity = "allow"

acrate_rdserver/src/config.rs

@@ -1,3 +1,4 @@
 micronfig::config!(
+	ACRATE_WEBFINGER_DATABASE_URL: String,
 	ACRATE_WEBFINGER_BIND_ADDRESS: String,
 );

acrate_rdserver/src/route.rs

@@ -6,17 +6,18 @@ use axum::http::{HeaderMap, Response, StatusCode};
 use axum_extra::extract::Query;
 use mediatype::{MediaTypeBuf, MediaTypeList};
 use serde::Deserialize;
-use acrate_database::connect::connect_async;
 use acrate_database::diesel::GroupedBy;
+use acrate_database::diesel_async::{AsyncConnection, AsyncPgConnection};
 use acrate_database::meta::{MetaAlias, MetaLink, MetaLinkProperty, MetaLinkTitle, MetaProperty, MetaSubject};
 use acrate_rd::jrd::ResourceDescriptorLinkJRD;
 use acrate_rd::xrd::{ResourceDescriptorLinkXRD, ResourceDescriptorPropertyXRD, ResourceDescriptorTitleXRD};
+use crate::config;
 
 pub async fn healthcheck_handler() -> Result<StatusCode, StatusCode> {
 	log::debug!("Handling an healthcheck request!");
 	
 	log::trace!("Making sure the database is up...");
-	let _conn = connect_async()
+	let _conn = AsyncPgConnection::establish(config::ACRATE_WEBFINGER_DATABASE_URL())
 		.await
 		.map_err(|_| StatusCode::BAD_GATEWAY)?;
 	
@@ -53,12 +54,12 @@ pub async fn webfinger_handler(
 	let accept = accept
 		.map(|h| h.to_str())
 		.unwrap_or(Ok("*/*"))
-		.map(MediaTypeList::new)
+		.map(|h| MediaTypeList::new(h))
 		.map_err(|_| StatusCode::BAD_REQUEST)?;
 	
 	let mut response = Response::new("".to_string());
 	
-	let mut conn = connect_async()
+	let mut conn = AsyncPgConnection::establish(config::ACRATE_WEBFINGER_DATABASE_URL())
 		.await
 		.map_err(|_| StatusCode::BAD_GATEWAY)?;