Unalign a little bit of column order

Author: smklein

nexus/db-schema/src/crdb_alignment_test.rs

@@ -566,18 +566,19 @@ async fn diesel_schema_matches_crdb_schema() {
          updating the file."
     );
 
-    if !column_order_drift.is_empty() {
-        column_order_drift.sort();
-        panic!(
-            "Column order in schema.rs differs from CRDB for {} table(s):\n\n\
-             {}\n\n\
-             The column order in the Diesel table! macro must match the \
-             column order in CRDB (dbinit.sql). Reorder the columns in \
-             schema.rs to match.",
-            column_order_drift.len(),
-            column_order_drift.join("\n"),
-        );
-    }
+    column_order_drift.sort();
+    let actual_order = format_list(&column_order_drift);
+    let expected_order =
+        std::fs::read_to_string("tests/output/schema_column_order_drift.txt")
+            .expect("failed to read schema_column_order_drift.txt");
+    similar_asserts::assert_eq!(
+        expected_order,
+        actual_order,
+        "Column order drift list doesn't match expected.\n\n\
+         This file tracks tables where the column order in schema.rs \
+         differs from CRDB. If this list changed, investigate whether \
+         the column order should be fixed rather than updating the file."
+    );
 
     mismatched_columns.sort();
     let actual_drift = format_list(&mismatched_columns);

nexus/db-schema/src/schema.rs

@@ -447,23 +447,23 @@ table! {
         time_deleted -> Nullable<Timestamptz>,
         project_id -> Uuid,
         user_data -> Binary,
+        ncpus -> Int8,
+        memory -> Int8,
+        hostname -> Text,
+        auto_restart_policy -> Nullable<crate::enums::InstanceAutoRestartPolicyEnum>,
+        auto_restart_cooldown -> Nullable<Interval>,
+        boot_disk_id -> Nullable<Uuid>,
+        cpu_platform -> Nullable<crate::enums::InstanceCpuPlatformEnum>,
         time_state_updated -> Timestamptz,
         state_generation -> Int8,
         active_propolis_id -> Nullable<Uuid>,
         target_propolis_id -> Nullable<Uuid>,
         migration_id -> Nullable<Uuid>,
-        ncpus -> Int8,
-        memory -> Int8,
-        hostname -> Text,
-        updater_id -> Nullable<Uuid>,
-        updater_gen-> Int8,
         state -> crate::enums::InstanceStateEnum,
         time_last_auto_restarted -> Nullable<Timestamptz>,
-        auto_restart_policy -> Nullable<crate::enums::InstanceAutoRestartPolicyEnum>,
-        auto_restart_cooldown -> Nullable<Interval>,
-        boot_disk_id -> Nullable<Uuid>,
         intended_state -> crate::enums::InstanceIntendedStateEnum,
-        cpu_platform -> Nullable<crate::enums::InstanceCpuPlatformEnum>,
+        updater_id -> Nullable<Uuid>,
+        updater_gen-> Int8,
     }
 }
 
@@ -475,13 +475,13 @@ table! {
         time_created -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
         instance_id -> Uuid,
-        time_state_updated -> Timestamptz,
-        state_generation -> Int8,
         sled_id -> Uuid,
         propolis_ip -> Inet,
         propolis_port -> Int4,
-        state -> crate::enums::VmmStateEnum,
         cpu_platform -> crate::enums::VmmCpuPlatformEnum,
+        time_state_updated -> Timestamptz,
+        state_generation -> Int8,
+        state -> crate::enums::VmmStateEnum,
     }
 }
 joinable!(vmm -> sled (sled_id));
@@ -492,13 +492,13 @@ table! {
         name -> Text,
         silo_name -> Text,
         project_name -> Text,
-        active_sled_id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
+        state -> crate::enums::VmmStateEnum,
+        active_sled_id -> Uuid,
         migration_id -> Nullable<Uuid>,
         ncpus -> Int8,
         memory -> Int8,
-        state -> crate::enums::VmmStateEnum,
     }
 }
 

nexus/db-schema/tests/output/schema_column_order_drift.txt

@@ -0,0 +1,3 @@
+instance
+sled_instance
+vmm