make columns nullable for cost model (#21)

Author: xx01cyx

optd-persistent/src/entities/constraint.rs

@@ -9,9 +9,9 @@ pub struct Model {
     pub id: i32,
     pub name: String,
     pub variant_tag: i32,
-    pub table_id: i32,
-    pub index_id: i32,
-    pub foreign_ref_id: i32,
+    pub table_id: Option<i32>,
+    pub index_id: Option<i32>,
+    pub foreign_ref_id: Option<i32>,
     pub check_src: String,
 }
 

optd-persistent/src/entities/statistic.rs

@@ -8,10 +8,10 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub name: String,
-    pub table_id: i32,
+    pub table_id: Option<i32>,
     pub created_time: DateTimeUtc,
     pub number_of_attributes: i32,
-    pub statistic_type: i32,
+    pub variant_tag: i32,
     pub description: String,
 }
 

optd-persistent/src/migrator/catalog/m20241029_000001_constraint.rs

@@ -1,16 +1,3 @@
-/*
-// Not-null is handled directly in `attribute`. See `is_not_null` field.
-// Constraint trigger is handled directly in `trigger`.
-Table constraint {
-  id integer PK
-  name varchar
-  constraint_type integer // pk, fk, unique, check, exclusion
-  table_id integer [ref: > table_metadata.id] // 0 if not a table constraint
-  index_id integer [ref: > index.id] // The index supporting this constraint, if it's a unique, primary key, foreign key, or exclusion constraint; else 0
-  foreign_ref_id integer [ref: > table_metadata.id] // If a foreign key, the referenced table; else 0
-  check_src varchar // the expression tree for a check constraint, which provides a textual representation of the constraint expression
-} */
-
 use crate::migrator::catalog::{index::Index, table_metadata::TableMetadata};
 use sea_orm_migration::{prelude::*, schema::*};
 
@@ -40,23 +27,23 @@ impl MigrationTrait for Migration {
                     .col(pk_auto(Constraint::Id))
                     .col(string(Constraint::Name))
                     .col(integer(Constraint::VariantTag))
-                    .col(integer(Constraint::TableId))
+                    .col(integer_null(Constraint::TableId))
                     .foreign_key(
                         ForeignKey::create()
                             .from(Constraint::Table, Constraint::TableId)
                             .to(TableMetadata::Table, TableMetadata::Id)
                             .on_delete(ForeignKeyAction::Cascade)
                             .on_update(ForeignKeyAction::Cascade),
                     )
-                    .col(integer(Constraint::IndexId))
+                    .col(integer_null(Constraint::IndexId))
                     .foreign_key(
                         ForeignKey::create()
                             .from(Constraint::Table, Constraint::IndexId)
                             .to(Index::Table, Index::Id)
                             .on_delete(ForeignKeyAction::Cascade)
                             .on_update(ForeignKeyAction::Cascade),
                     )
-                    .col(integer(Constraint::ForeignRefId))
+                    .col(integer_null(Constraint::ForeignRefId))
                     .foreign_key(
                         ForeignKey::create()
                             .from(Constraint::Table, Constraint::ForeignRefId)

optd-persistent/src/migrator/cost_model/m20241029_000001_statistic.rs

@@ -18,9 +18,7 @@ pub enum Statistic {
     CreatedTime,
     // 0 if a table statistic.
     NumberOfAttributes,
-    // TODO(lanlou): Should we make another table to explain the type mapping?
-    #[allow(clippy::enum_variant_names)]
-    StatisticType,
+    VariantTag,
     // Store the sorted attribute ids of this statistic, to support quick lookup (OR we can use junction table to look up)
     // For example, if we want to store the statistic of attributes [1, 2, 3], we can store it as "1,2,3".
     // During lookup, we should first sort the attribute ids, and then look up.
@@ -41,7 +39,7 @@ impl MigrationTrait for Migration {
                     .if_not_exists()
                     .col(pk_auto(Statistic::Id))
                     .col(string(Statistic::Name))
-                    .col(integer(Statistic::TableId))
+                    .col(integer_null(Statistic::TableId))
                     .foreign_key(
                         ForeignKey::create()
                             .from(Statistic::Table, Statistic::TableId)
@@ -51,7 +49,7 @@ impl MigrationTrait for Migration {
                     )
                     .col(timestamp(Statistic::CreatedTime))
                     .col(integer(Statistic::NumberOfAttributes))
-                    .col(integer(Statistic::StatisticType))
+                    .col(integer(Statistic::VariantTag))
                     .col(string(Statistic::Description))
                     .to_owned(),
             )

schema/all_tables.dbml

@@ -33,10 +33,10 @@ Table attribute {
 Table statistic {
   id integer PK
   name varchar
-  table_id integer [ref: > table_metadata.id] // null if not a table statistic
+  table_id integer [ref: > table_metadata.id, null] // null if not a table statistic
   created_time timestamp
   number_of_attributes integer // 0 if a table statistic
-  statistic_type integer // Should we make another table to explain the type mapping?
+  variant_tag integer // Should we make another table to explain the type mapping?
   description varchar // Store the sorted attribute ids of this statistic, to support quick lookup (OR we can use junction table to look up)
 }
 
@@ -98,10 +98,10 @@ Table trigger {
 Table constraint {
   id integer PK
   name varchar
-  constraint_type integer // pk, fk, unique, check, exclusion
-  table_id integer [ref: > table_metadata.id] // null if not a table constraint
-  index_id integer [ref: > index.id] // The index supporting this constraint, if it's a unique, primary key, foreign key, or exclusion constraint; else null
-  foreign_ref_id integer [ref: > table_metadata.id] // If a foreign key, the referenced table; else null
+  variant_tag integer // pk, fk, unique, check, exclusion
+  table_id integer [ref: > table_metadata.id, null] // null if not a table constraint
+  index_id integer [ref: > index.id, null] // The index supporting this constraint, if it's a unique, primary key, foreign key, or exclusion constraint; else null
+  foreign_ref_id integer [ref: > table_metadata.id, null] // If a foreign key, the referenced table; else null
   check_src varchar // the expression tree for a check constraint, which provides a textual representation of the constraint expression
 }