diff --git a/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs b/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs index c55ed0bd68..7cb2f340d4 100644 --- a/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs +++ b/nexus/db-queries/src/db/queries/virtual_provisioning_collection_update.rs @@ -21,7 +21,8 @@ use diesel::query_builder::{AstPass, Query, QueryFragment, QueryId}; use diesel::result::Error as DieselError; use diesel::{ sql_types, BoolExpressionMethods, CombineDsl, ExpressionMethods, IntoSql, - NullableExpressionMethods, QueryDsl, RunQueryDsl, SelectableHelper, + JoinOnDsl, NullableExpressionMethods, QueryDsl, RunQueryDsl, + SelectableHelper, }; use nexus_db_model::queries::virtual_provisioning_collection_update::{ all_collections, do_update, parent_silo, quotas, silo_provisioned, @@ -272,12 +273,10 @@ impl Quotas { Self { query: Box::new( dsl::silo_quotas - .filter( - dsl::silo_id.eq(parent_silo + .inner_join( + parent_silo .query_source() - .select(parent_silo::id) - .single_value() - .assume_not_null()), + .on(dsl::silo_id.eq(parent_silo::id)), ) .select(( dsl::silo_id, @@ -306,12 +305,10 @@ impl SiloProvisioned { Self { query: Box::new( dsl::virtual_provisioning_collection - .filter( - dsl::id.eq(parent_silo + .inner_join( + parent_silo .query_source() - .select(parent_silo::id) - .single_value() - .assume_not_null()), + .on(dsl::id.eq(parent_silo::id)), ) .select(( dsl::id, diff --git a/nexus/preprocessed_configs/config.xml b/nexus/preprocessed_configs/config.xml new file mode 100644 index 0000000000..9b13f12aea --- /dev/null +++ b/nexus/preprocessed_configs/config.xml @@ -0,0 +1,41 @@ + + + + + trace + true + + + 8123 + 9000 + 9004 + + ./ + + true + + + + + + + ::/0 + + + default + default + 1 + + + + + + + + + + + \ No newline at end of file