Browse Source

Update Diesel macros and remove unnecessary SUPPORTED_FEATURE_FLAG

pull/6916/head
Matt Aaron 3 weeks ago
parent
commit
b3b47eb352
  1. 2
      src/config.rs
  2. 3
      src/db/schema.rs

2
src/config.rs

@ -1485,8 +1485,6 @@ pub const SUPPORTED_FEATURE_FLAGS: &[&str] = &[
"cxp-export-mobile", "cxp-export-mobile",
// Platform Team // Platform Team
"pm-30529-webauthn-related-origins", "pm-30529-webauthn-related-origins",
// Innovation Team
"pm-19148-innovation-archive",
]; ];
impl Config { impl Config {

3
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!(attachments -> ciphers (cipher_uuid));
joinable!(ciphers -> organizations (organization_uuid)); joinable!(ciphers -> organizations (organization_uuid));
joinable!(ciphers -> users (user_uuid)); joinable!(ciphers -> users (user_uuid));
@ -380,6 +382,7 @@ joinable!(auth_requests -> users (user_uuid));
joinable!(sso_users -> users (user_uuid)); joinable!(sso_users -> users (user_uuid));
allow_tables_to_appear_in_same_query!( allow_tables_to_appear_in_same_query!(
archives,
attachments, attachments,
ciphers, ciphers,
ciphers_collections, ciphers_collections,

Loading…
Cancel
Save