Skip to content

Commit

Permalink
Columns go to the end
Browse files Browse the repository at this point in the history
  • Loading branch information
smklein committed Mar 27, 2024
1 parent 940ba5b commit d8cb14c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions nexus/db-model/src/physical_disk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ pub struct PhysicalDisk {
pub model: String,

pub variant: PhysicalDiskKind,
pub sled_id: Uuid,
pub disk_policy: PhysicalDiskPolicy,
pub disk_state: PhysicalDiskState,
pub sled_id: Uuid,
}

impl PhysicalDisk {
Expand All @@ -49,9 +49,9 @@ impl PhysicalDisk {
serial,
model,
variant,
sled_id,
disk_policy: PhysicalDiskPolicy::InService,
disk_state: PhysicalDiskState::Active,
sled_id,
}
}

Expand Down
6 changes: 3 additions & 3 deletions schema/crdb/dbinit.sql
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,12 @@ CREATE TABLE IF NOT EXISTS omicron.public.physical_disk (

variant omicron.public.physical_disk_kind NOT NULL,

disk_policy omicron.public.physical_disk_policy NOT NULL,
disk_state omicron.public.physical_disk_state NOT NULL,

-- FK into the Sled table
sled_id UUID NOT NULL,

disk_policy omicron.public.physical_disk_policy NOT NULL,
disk_state omicron.public.physical_disk_state NOT NULL,

-- This constraint should be upheld, even for deleted disks
-- in the fleet.
CONSTRAINT vendor_serial_model_unique UNIQUE (
Expand Down

0 comments on commit d8cb14c

Please sign in to comment.