Convert virtual provisioning CTE to use raw SQL

nexus/db-model/src/lib.rs

@@ -21,6 +21,7 @@ mod console_session;
 mod dataset;
 mod dataset_kind;
 mod db_metadata;
+mod deployment;
 mod device_auth;
 mod digest;
 mod disk;
@@ -35,28 +36,20 @@ mod instance_cpu_count;
 mod instance_state;
 mod inventory;
 mod ip_pool;
+mod ipv4_nat_entry;
 mod ipv4net;
 pub mod ipv6;
 mod ipv6net;
 mod l4_port_range;
 mod macaddr;
 mod name;
 mod network_interface;
+mod omicron_zone_config;
 mod oximeter_info;
 mod physical_disk;
 mod physical_disk_kind;
 mod producer_endpoint;
 mod project;
-mod semver_version;
-mod switch_interface;
-mod switch_port;
-// These actually represent subqueries, not real table.
-// However, they must be defined in the same crate as our tables
-// for join-based marker trait generation.
-mod deployment;
-mod ipv4_nat_entry;
-mod omicron_zone_config;
-pub mod queries;
 mod quota;
 mod rack;
 mod region;
@@ -65,6 +58,7 @@ mod role_assignment;
 mod role_builtin;
 pub mod saga_types;
 pub mod schema;
+mod semver_version;
 mod service;
 mod service_kind;
 mod silo;
@@ -80,6 +74,8 @@ mod sled_underlay_subnet_allocation;
 mod snapshot;
 mod ssh_key;
 mod switch;
+mod switch_interface;
+mod switch_port;
 mod tuf_repo;
 mod unsigned;
 mod user_builtin;

nexus/db-queries/src/db/mod.rs

@@ -4,7 +4,6 @@
 
 //! Facilities for working with the Omicron database
 
-pub(crate) mod alias;
 // This is not intended to be public, but this is necessary to use it from
 // doctests
 pub mod collection_attach;