merge: #4058

4058: hotifx(module-index-server): ignore new columns r=zacharyhamm a=zacharyhamm Co-authored-by: Zachary Hamm <[email protected]>
systeminit · Jun 28, 2024 · f8fecca · f8fecca
2 parents 395bc96 + ef97b8b
commit f8fecca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/lib/module-index-server/src/models/si_module.rs b/lib/module-index-server/src/models/si_module.rs
@@ -6,7 +6,7 @@ pub mod module_id;
 pub mod schema_id;
 
 pub use module_id::ModuleId;
-pub use schema_id::SchemaId;
+// pub use schema_id::SchemaId;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -98,12 +98,12 @@ pub struct Model {
     pub kind: ModuleKind,
     pub is_builtin_at: Option<DateTimeWithTimeZone>,
     pub is_builtin_at_by_display_name: Option<String>,
-    #[sea_orm(column_type = "Text")]
-    pub schema_name: Option<String>,
-    #[sea_orm(column_type = "Text")]
-    pub schema_category: Option<String>,
-    #[sea_orm(column_type = r##"custom("ident")"##)]
-    pub schema_id: Option<SchemaId>,
+    // #[sea_orm(column_type = "Text")]
+    // pub schema_name: Option<String>,
+    // #[sea_orm(column_type = "Text")]
+    // pub schema_category: Option<String>,
+    // #[sea_orm(column_type = r##"custom("ident")"##)]
+    // pub schema_id: Option<SchemaId>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

diff --git a/lib/module-index-server/src/routes/promote_builtin_route.rs b/lib/module-index-server/src/routes/promote_builtin_route.rs
@@ -91,9 +91,9 @@ pub async fn promote_builtin_route(
             Utc.fix(),
         ))),
         is_builtin_at_by_display_name: Set(Some(data)),
-        schema_name: Set(module.schema_name),
-        schema_category: Set(module.schema_category),
-        schema_id: Set(module.schema_id),
+        // schema_name: Set(module.schema_name),
+        // schema_category: Set(module.schema_category),
+        // schema_id: Set(module.schema_id),
     };
 
     let updated_module: si_module::Model = active_module.update(&txn).await?;

diff --git a/lib/module-index-server/src/routes/reject_module_route.rs b/lib/module-index-server/src/routes/reject_module_route.rs
@@ -91,9 +91,9 @@ pub async fn reject_module(
         kind: Set(module.kind),
         is_builtin_at: Set(module.is_builtin_at),
         is_builtin_at_by_display_name: Set(module.is_builtin_at_by_display_name),
-        schema_category: Set(module.schema_category),
-        schema_name: Set(module.schema_name),
-        schema_id: Set(module.schema_id),
+        // schema_category: Set(module.schema_category),
+        // schema_name: Set(module.schema_name),
+        // schema_id: Set(module.schema_id),
     };
 
     let updated_module: si_module::Model = dbg!(active_module.update(&txn).await)?;