diff --git a/src/config.rs b/src/config.rs index 26fb69e6..6ff09467 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1485,8 +1485,6 @@ pub const SUPPORTED_FEATURE_FLAGS: &[&str] = &[ "cxp-export-mobile", // Platform Team "pm-30529-webauthn-related-origins", - // Innovation Team - "pm-19148-innovation-archive", ]; impl Config { diff --git a/src/db/schema.rs b/src/db/schema.rs index 4856b923..2963ad8d 100644 --- a/src/db/schema.rs +++ b/src/db/schema.rs @@ -349,6 +349,8 @@ table! { } } +joinable!(archives -> users (user_uuid)); +joinable!(archives -> ciphers (cipher_uuid)); joinable!(attachments -> ciphers (cipher_uuid)); joinable!(ciphers -> organizations (organization_uuid)); joinable!(ciphers -> users (user_uuid)); @@ -380,6 +382,7 @@ joinable!(auth_requests -> users (user_uuid)); joinable!(sso_users -> users (user_uuid)); allow_tables_to_appear_in_same_query!( + archives, attachments, ciphers, ciphers_collections,