i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr-461'

Browse Source 
# Conflicts:
#	.github/workflows/rust-ci.yml
#	crates/aether-data/src/lifecycle/bootstrap/postgres.rs
#	crates/aether-data/src/lifecycle/migrate/tests.rs
This commit is contained in:
fawney19
2026-05-15 21:52:37 +08:00
parent 8eb4c029b2 88d8a8b79f
commit c916e76bd2
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/aether-data/migrations/postgres/20260515000000_add_audit_admin_to_userrole.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TYPE public.userrole ADD VALUE IF NOT EXISTS 'audit_admin';

1
crates/aether-data/schema/bootstrap/postgres/001_types_and_tables.sql
View File

@@ -91,6 +91,7 @@ END $mig$;
DO $mig$ BEGIN
CREATE TYPE public.userrole AS ENUM (
'admin',
'audit_admin',
'user'
);
EXCEPTION WHEN duplicate_object THEN NULL;

2
crates/aether-data/src/lifecycle/bootstrap/postgres.rs
View File

@@ -7,7 +7,7 @@ use tracing::info;
// Generated by build.rs from schema/bootstrap/postgres.
pub(crate) static EMPTY_DATABASE_SNAPSHOT_SQL: &str =
include_str!(concat!(env!("OUT_DIR"), "/empty_database_snapshot.sql"));
pub(crate) const EMPTY_DATABASE_SNAPSHOT_CUTOFF_VERSION: i64 = 20260512110000;
pub(crate) const EMPTY_DATABASE_SNAPSHOT_CUTOFF_VERSION: i64 = 20260515000000;
const PUBLIC_BASE_TABLE_COUNT_SQL: &str = r#"
SELECT COUNT(*)::BIGINT

16
crates/aether-data/src/lifecycle/migrate/tests.rs
View File

@@ -304,12 +304,14 @@ fn empty_database_snapshot_covers_current_cutoff_versions() {
20260512000000,
20260512090000,
20260512110000,
20260515000000,
]
);
}
#[test]
fn empty_database_snapshot_sql_includes_usage_body_blobs() {
fn empty_database_snapshot_sql_includes_usage_body_blobs_and_audit_admin_role() {
assert!(EMPTY_DATABASE_SNAPSHOT_SQL.contains("'audit_admin'"));
assert!(
EMPTY_DATABASE_SNAPSHOT_SQL.contains("CREATE TABLE IF NOT EXISTS public.usage_body_blobs")
);
@@ -1116,6 +1118,7 @@ fn pending_migrations_from_applied_skips_versions_already_applied() {
20260512000000,
20260512090000,
20260512110000,
20260515000000,
]
);
}
@@ -1443,6 +1446,17 @@ async fn prepare_database_for_startup_bootstraps_clean_database() {
.await
.expect("api_keys.total_tokens lookup should succeed"));
let audit_admin_exists: bool = query_scalar(
"SELECT EXISTS (SELECT 1 FROM pg_enum WHERE enumtypid = 'public.userrole'::regtype AND enumlabel = 'audit_admin')",
)
.fetch_one(&pool)
.await
.expect("public.userrole audit_admin lookup should succeed");
assert!(
audit_admin_exists,
"fresh database snapshot should include public.userrole.audit_admin"
);
let applied_count: i64 = query_scalar("SELECT COUNT(*)::BIGINT FROM public._sqlx_migrations")
.fetch_one(&pool)
.await