fix merge conflictsg

Signed-off-by: Stephen Hwang <126002920+sthwang-metal@users.noreply.github.com>
sthwang-metal · Feb 14, 2024 · 970284c · 970284c
1 parent 6f57c84
commit 970284c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/db/migrations/20231220213519_change_port_name_optional.sql b/db/migrations/20231220213519_change_port_name_optional.sql
diff --git a/db/migrations/20240214095509_change_port_name_optional.sql b/db/migrations/20240214095509_change_port_name_optional.sql
@@ -0,0 +1,7 @@
+-- +goose Up
+-- modify "ports" table
+ALTER TABLE "ports" ALTER COLUMN "name" DROP NOT NULL;
+
+-- +goose Down
+-- reverse: modify "ports" table
+ALTER TABLE "ports" ALTER COLUMN "name" SET NOT NULL;
diff --git a/db/migrations/atlas.sum b/db/migrations/atlas.sum
@@ -1,7 +1,8 @@
-h1:0KtiTooJCnoUsSF1CYnlRKEVEQFmH2Fj55S/41WmJr8=
+h1:MujJgh8ifO4DK4QeukfFWRsa5OFI9Q0agyQwNlkI/3Q=
 20230503185445_initial-migration.sql h1:4pqNp2MDBBRdGxU/H5mmZui9oi1SyjIiMVGatajrBeY=
 20230615194819_drop_tenant_add_owner.sql h1:KGCsItU0NYhxYEkhZOaMQjfIrBMnek5rxC6D/LhnyCk=
 20230629085916_drop_status_and_annotations.sql h1:kvDMoaMEjyoj/aRi6rw4XvCLxGH09vGGLbL0/p5tpPo=
 20231017005257_add_origin_weight.sql h1:NuorUbcydDqcyPK8wgwlkQxaH+zGWfVtJW9UPL1Vn+E=
 20240207205734_audit-fields.sql h1:cplFCBB7laCP5Y+UAoxIfITMo56Hoc5XIVvgcfGL9o0=
 20240208121103_softdelete.sql h1:rt3nHn/1KzxSAbJZ33fQJZi5emLk7Q2PCRcfxWUeveY=
+20240214095509_change_port_name_optional.sql h1:ArlIsVK4Tgi6AW6NiRMbAqU43+5KFqDkaa+YmxSoBkE=
diff --git a/internal/ent/generated/mutation.go b/internal/ent/generated/mutation.go