Sasedev/khadhroony-bobobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.7.27 +Refactor

Browse Source
This commit is contained in:
SinuS von SifriduS
2026-05-10 00:33:01 +02:00
parent cb2e8e7096
commit 1f0137b9de
261 changed files with 12308 additions and 8928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
kb_lib/src/db/queries/db_metadata.rs
View File

@@ -1,18 +1,18 @@
// file: kb_lib/src/db/queries/db_metadata.rs
//! Queries for `kb_db_metadata`.
//! Queries for `k_sol_db_metadata`.
/// Inserts or updates one metadata row.
pub async fn upsert_db_metadata(
database: &crate::KbDatabase,
dto: &crate::KbDbMetadataDto,
) -> Result<(), crate::KbError> {
let entity = crate::KbDbMetadataEntity::from(dto.clone());
pub async fn query_db_metadatas_upsert(
database: &crate::Database,
dto: &crate::DbMetadataDto,
) -> Result<(), crate::Error> {
let entity = crate::DbMetadataEntity::from(dto.clone());
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query(
r#"
INSERT INTO kb_db_metadata (
INSERT INTO k_sol_db_metadata (
key,
value,
updated_at
@@ -31,8 +31,8 @@ ON CONFLICT(key) DO UPDATE SET
match query_result {
Ok(_) => return Ok(()),
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot upsert kb_db_metadata on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot upsert k_sol_db_metadata on sqlite: {}",
error
)));
},
@@ -42,19 +42,19 @@ ON CONFLICT(key) DO UPDATE SET
}
/// Reads one metadata row by key.
pub async fn get_db_metadata(
database: &crate::KbDatabase,
pub async fn query_db_metadatas_get(
database: &crate::Database,
key: &str,
) -> Result<std::option::Option<crate::KbDbMetadataDto>, crate::KbError> {
) -> Result<std::option::Option<crate::DbMetadataDto>, crate::Error> {
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbDbMetadataEntity>(
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::DbMetadataEntity>(
r#"
SELECT
key,
value,
updated_at
FROM kb_db_metadata
FROM k_sol_db_metadata
WHERE key = ?
LIMIT 1
"#,
@@ -65,15 +65,15 @@ LIMIT 1
let entity_option = match query_result {
Ok(entity_option) => entity_option,
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot read kb_db_metadata '{}' on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot read k_sol_db_metadata '{}' on sqlite: {}",
key, error
)));
},
};
match entity_option {
Some(entity) => {
let dto_result = crate::KbDbMetadataDto::try_from(entity);
let dto_result = crate::DbMetadataDto::try_from(entity);
match dto_result {
Ok(dto) => return Ok(Some(dto)),
Err(error) => return Err(error),
@@ -86,18 +86,18 @@ LIMIT 1
}
/// Lists all metadata rows.
pub async fn list_db_metadata(
database: &crate::KbDatabase,
) -> Result<std::vec::Vec<crate::KbDbMetadataDto>, crate::KbError> {
pub async fn query_db_metadatas_list(
database: &crate::Database,
) -> Result<std::vec::Vec<crate::DbMetadataDto>, crate::Error> {
match database.connection() {
crate::KbDatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbDbMetadataEntity>(
crate::DatabaseConnection::Sqlite(pool) => {
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::DbMetadataEntity>(
r#"
SELECT
key,
value,
updated_at
FROM kb_db_metadata
FROM k_sol_db_metadata
ORDER BY key ASC
"#,
)
@@ -106,15 +106,15 @@ ORDER BY key ASC
let entities = match query_result {
Ok(entities) => entities,
Err(error) => {
return Err(crate::KbError::Db(format!(
"cannot list kb_db_metadata on sqlite: {}",
return Err(crate::Error::Db(format!(
"cannot list k_sol_db_metadata on sqlite: {}",
error
)));
},
};
let mut dtos = std::vec::Vec::new();
for entity in entities {
let dto_result = crate::KbDbMetadataDto::try_from(entity);
let dto_result = crate::DbMetadataDto::try_from(entity);
let dto = match dto_result {
Ok(dto) => dto,
Err(error) => return Err(error),
@@ -132,10 +132,10 @@ mod tests {
async fn db_metadata_roundtrip_works() {
let tempdir = tempfile::tempdir().expect("tempdir must succeed");
let database_path = tempdir.path().join("roundtrip.sqlite3");
let config = crate::KbDatabaseConfig {
let config = crate::DatabaseConfig {
enabled: true,
backend: crate::KbDatabaseBackend::Sqlite,
sqlite: crate::KbSqliteDatabaseConfig {
backend: crate::DatabaseBackend::Sqlite,
sqlite: crate::SqliteDatabaseConfig {
path: database_path.to_string_lossy().to_string(),
create_if_missing: true,
busy_timeout_ms: 5000,
@@ -144,19 +144,21 @@ mod tests {
use_wal: true,
},
};
let database = crate::KbDatabase::connect_and_initialize(&config)
let database = crate::Database::connect_and_initialize(&config)
.await
.expect("database init must succeed");
let dto = crate::KbDbMetadataDto::new("schema_version".to_string(), "0.5.0".to_string());
crate::upsert_db_metadata(&database, &dto).await.expect("upsert must succeed");
let fetched = crate::get_db_metadata(&database, "schema_version")
let dto = crate::DbMetadataDto::new("schema_version".to_string(), "0.5.0".to_string());
crate::query_db_metadatas_upsert(&database, &dto)
.await
.expect("upsert must succeed");
let fetched = crate::query_db_metadatas_get(&database, "schema_version")
.await
.expect("fetch must succeed");
assert!(fetched.is_some());
let fetched = fetched.expect("metadata must exist");
assert_eq!(fetched.key, "schema_version");
assert_eq!(fetched.value, "0.5.0");
let listed = crate::list_db_metadata(&database).await.expect("list must succeed");
let listed = crate::query_db_metadatas_list(&database).await.expect("list must succeed");
assert!(!listed.is_empty());
}
}