commit 40bc12273ed079895a7613ffac48f6e723e68ada parent 98e57a8f79d9a61f15ad53adcb5316de0b731d69 Author: triesap <tyson@radroots.org> Date: Wed, 4 Mar 2026 17:53:31 +0000 replica-db: run cargo fmt Diffstat:
21 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/crates/replica-db/src/export.rs b/crates/replica-db/src/export.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; use crate::backup::{ - DATABASE_BACKUP_VERSION, MigrationBackup, SchemaEntry, REPLICA_DB_VERSION, escape_identifier, + DATABASE_BACKUP_VERSION, MigrationBackup, REPLICA_DB_VERSION, SchemaEntry, escape_identifier, export_migrations, load_schema, }; @@ -26,7 +26,9 @@ pub struct ReplicaDbExportManifestRs { pub table_counts: Vec<TableCount>, } -pub fn export_manifest<E: SqlExecutor>(executor: &E) -> Result<ReplicaDbExportManifestRs, SqlError> { +pub fn export_manifest<E: SqlExecutor>( + executor: &E, +) -> Result<ReplicaDbExportManifestRs, SqlError> { let schema = load_schema(executor)?; let migrations = export_migrations(); let table_counts = load_table_counts(executor, &schema)?; diff --git a/crates/replica-db/src/lib.rs b/crates/replica-db/src/lib.rs @@ -121,7 +121,9 @@ pub mod models; #[cfg(not(feature = "coverage-minimal"))] pub use backup::{DatabaseBackup, MigrationBackup, SchemaEntry}; #[cfg(not(feature = "coverage-minimal"))] -pub use export::{REPLICA_DB_EXPORT_VERSION, TableCount, ReplicaDbExportManifestRs, export_manifest}; +pub use export::{ + REPLICA_DB_EXPORT_VERSION, ReplicaDbExportManifestRs, TableCount, export_manifest, +}; #[cfg(not(feature = "coverage-minimal"))] pub use models::*; diff --git a/crates/replica-db/src/models/farm.rs b/crates/replica-db/src/models/farm.rs @@ -1,10 +1,10 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::farm::{ Farm, FarmQueryBindValues, IFarmCreate, IFarmCreateResolve, IFarmDelete, IFarmDeleteResolve, IFarmFieldsFilter, IFarmFindMany, IFarmFindManyResolve, IFarmFindOne, IFarmFindOneResolve, IFarmUpdate, IFarmUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/farm_gcs_location.rs b/crates/replica-db/src/models/farm_gcs_location.rs @@ -1,5 +1,3 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::farm_gcs_location::{ FarmGcsLocation, FarmGcsLocationQueryBindValues, IFarmGcsLocationCreate, IFarmGcsLocationCreateResolve, IFarmGcsLocationDelete, IFarmGcsLocationDeleteResolve, @@ -7,6 +5,8 @@ use radroots_replica_db_schema::farm_gcs_location::{ IFarmGcsLocationFindOne, IFarmGcsLocationFindOneResolve, IFarmGcsLocationUpdate, IFarmGcsLocationUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/farm_member.rs b/crates/replica-db/src/models/farm_member.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::farm_member::{ FarmMember, FarmMemberQueryBindValues, IFarmMemberCreate, IFarmMemberCreateResolve, IFarmMemberDelete, IFarmMemberDeleteResolve, IFarmMemberFieldsFilter, IFarmMemberFindMany, IFarmMemberFindManyResolve, IFarmMemberFindOne, IFarmMemberFindOneResolve, IFarmMemberUpdate, IFarmMemberUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/farm_member_claim.rs b/crates/replica-db/src/models/farm_member_claim.rs @@ -1,5 +1,3 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::farm_member_claim::{ FarmMemberClaim, FarmMemberClaimQueryBindValues, IFarmMemberClaimCreate, IFarmMemberClaimCreateResolve, IFarmMemberClaimDelete, IFarmMemberClaimDeleteResolve, @@ -7,6 +5,8 @@ use radroots_replica_db_schema::farm_member_claim::{ IFarmMemberClaimFindOne, IFarmMemberClaimFindOneResolve, IFarmMemberClaimUpdate, IFarmMemberClaimUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/farm_tag.rs b/crates/replica-db/src/models/farm_tag.rs @@ -1,10 +1,10 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::farm_tag::{ FarmTag, FarmTagQueryBindValues, IFarmTagCreate, IFarmTagCreateResolve, IFarmTagDelete, IFarmTagDeleteResolve, IFarmTagFieldsFilter, IFarmTagFindMany, IFarmTagFindManyResolve, IFarmTagFindOne, IFarmTagFindOneResolve, IFarmTagUpdate, IFarmTagUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/gcs_location.rs b/crates/replica-db/src/models/gcs_location.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::gcs_location::{ GcsLocation, GcsLocationFindManyRel, GcsLocationQueryBindValues, IGcsLocationCreate, IGcsLocationCreateResolve, IGcsLocationDelete, IGcsLocationDeleteResolve, IGcsLocationFieldsFilter, IGcsLocationFindMany, IGcsLocationFindManyResolve, IGcsLocationFindOne, IGcsLocationFindOneResolve, IGcsLocationUpdate, IGcsLocationUpdateResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/log_error.rs b/crates/replica-db/src/models/log_error.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::log_error::{ ILogErrorCreate, ILogErrorCreateResolve, ILogErrorDelete, ILogErrorDeleteResolve, ILogErrorFieldsFilter, ILogErrorFindMany, ILogErrorFindManyResolve, ILogErrorFindOne, ILogErrorFindOneResolve, ILogErrorUpdate, ILogErrorUpdateResolve, LogError, LogErrorQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/media_image.rs b/crates/replica-db/src/models/media_image.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::media_image::{ IMediaImageCreate, IMediaImageCreateResolve, IMediaImageDelete, IMediaImageDeleteResolve, IMediaImageFieldsFilter, IMediaImageFindMany, IMediaImageFindManyResolve, IMediaImageFindOne, IMediaImageFindOneResolve, IMediaImageUpdate, IMediaImageUpdateResolve, MediaImage, MediaImageFindManyRel, MediaImageQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/nostr_event_state.rs b/crates/replica-db/src/models/nostr_event_state.rs @@ -1,5 +1,3 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::nostr_event_state::{ INostrEventStateCreate, INostrEventStateCreateResolve, INostrEventStateDelete, INostrEventStateDeleteResolve, INostrEventStateFieldsFilter, INostrEventStateFindMany, @@ -7,6 +5,8 @@ use radroots_replica_db_schema::nostr_event_state::{ INostrEventStateUpdate, INostrEventStateUpdateResolve, NostrEventState, NostrEventStateQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/nostr_profile.rs b/crates/replica-db/src/models/nostr_profile.rs @@ -1,5 +1,3 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::nostr_profile::{ INostrProfileCreate, INostrProfileCreateResolve, INostrProfileDelete, INostrProfileDeleteResolve, INostrProfileFieldsFilter, INostrProfileFindMany, @@ -7,6 +5,8 @@ use radroots_replica_db_schema::nostr_profile::{ INostrProfileUpdate, INostrProfileUpdateResolve, NostrProfile, NostrProfileFindManyRel, NostrProfileQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/nostr_profile_relay.rs b/crates/replica-db/src/models/nostr_profile_relay.rs @@ -1,8 +1,8 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::nostr_profile_relay::{ INostrProfileRelayRelation, INostrProfileRelayResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResultPass}; use serde_json::Value; diff --git a/crates/replica-db/src/models/nostr_relay.rs b/crates/replica-db/src/models/nostr_relay.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::nostr_relay::{ INostrRelayCreate, INostrRelayCreateResolve, INostrRelayDelete, INostrRelayDeleteResolve, INostrRelayFieldsFilter, INostrRelayFindMany, INostrRelayFindManyResolve, INostrRelayFindOne, INostrRelayFindOneResolve, INostrRelayUpdate, INostrRelayUpdateResolve, NostrRelay, NostrRelayFindManyRel, NostrRelayQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/plot.rs b/crates/replica-db/src/models/plot.rs @@ -1,10 +1,10 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::plot::{ IPlotCreate, IPlotCreateResolve, IPlotDelete, IPlotDeleteResolve, IPlotFieldsFilter, IPlotFindMany, IPlotFindManyResolve, IPlotFindOne, IPlotFindOneResolve, IPlotUpdate, IPlotUpdateResolve, Plot, PlotQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/plot_gcs_location.rs b/crates/replica-db/src/models/plot_gcs_location.rs @@ -1,5 +1,3 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::plot_gcs_location::{ IPlotGcsLocationCreate, IPlotGcsLocationCreateResolve, IPlotGcsLocationDelete, IPlotGcsLocationDeleteResolve, IPlotGcsLocationFieldsFilter, IPlotGcsLocationFindMany, @@ -7,6 +5,8 @@ use radroots_replica_db_schema::plot_gcs_location::{ IPlotGcsLocationUpdate, IPlotGcsLocationUpdateResolve, PlotGcsLocation, PlotGcsLocationQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/plot_tag.rs b/crates/replica-db/src/models/plot_tag.rs @@ -1,10 +1,10 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::plot_tag::{ IPlotTagCreate, IPlotTagCreateResolve, IPlotTagDelete, IPlotTagDeleteResolve, IPlotTagFieldsFilter, IPlotTagFindMany, IPlotTagFindManyResolve, IPlotTagFindOne, IPlotTagFindOneResolve, IPlotTagUpdate, IPlotTagUpdateResolve, PlotTag, PlotTagQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/trade_product.rs b/crates/replica-db/src/models/trade_product.rs @@ -1,11 +1,11 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::trade_product::{ ITradeProductCreate, ITradeProductCreateResolve, ITradeProductDelete, ITradeProductDeleteResolve, ITradeProductFieldsFilter, ITradeProductFindMany, ITradeProductFindManyResolve, ITradeProductFindOne, ITradeProductFindOneResolve, ITradeProductUpdate, ITradeProductUpdateResolve, TradeProduct, TradeProductQueryBindValues, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResult, IResultList}; use serde_json::Value; diff --git a/crates/replica-db/src/models/trade_product_location.rs b/crates/replica-db/src/models/trade_product_location.rs @@ -1,8 +1,8 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::trade_product_location::{ ITradeProductLocationRelation, ITradeProductLocationResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResultPass}; use serde_json::Value; diff --git a/crates/replica-db/src/models/trade_product_media.rs b/crates/replica-db/src/models/trade_product_media.rs @@ -1,8 +1,8 @@ -use radroots_sql_core::error::SqlError; -use radroots_sql_core::{SqlExecutor, utils}; use radroots_replica_db_schema::trade_product_media::{ ITradeProductMediaRelation, ITradeProductMediaResolve, }; +use radroots_sql_core::error::SqlError; +use radroots_sql_core::{SqlExecutor, utils}; use radroots_types::types::{IError, IResultPass}; use serde_json::Value; diff --git a/crates/replica-db/tests/full_mode.rs b/crates/replica-db/tests/full_mode.rs @@ -1,4 +1,3 @@ -use radroots_sql_core::{SqlError, SqliteExecutor}; use radroots_replica_db::{ReplicaSql, export_manifest}; use radroots_replica_db_schema::farm::{ IFarmCreate, IFarmDelete, IFarmFindMany, IFarmFindOne, IFarmUpdate, @@ -59,6 +58,7 @@ use radroots_replica_db_schema::trade_product::{ }; use radroots_replica_db_schema::trade_product_location::ITradeProductLocationRelation; use radroots_replica_db_schema::trade_product_media::ITradeProductMediaRelation; +use radroots_sql_core::{SqlError, SqliteExecutor}; use radroots_types::types::IError; use serde::de::DeserializeOwned; use serde_json::json;