Merge pull request #37 from dev-five-git/support-default

Support boolean type at default

Author: owjs3901

.changepacks/changepack_log_GTJoe2RUk4HKVhaSaCZxS.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-naming/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch"},"note":"Support boolean type at default","date":"2025-12-24T05:46:19.710280200Z"}

Cargo.lock

@@ -6,6 +6,6 @@ pub use action::{MigrationAction, MigrationPlan};
 pub use migration::{MigrationError, MigrationOptions};
 pub use schema::{
     ColumnDef, ColumnName, ColumnType, ComplexColumnType, EnumValues, IndexDef, IndexName,
-    NumValue, ReferenceAction, SimpleColumnType, StrOrBoolOrArray, TableConstraint, TableDef,
-    TableName, TableValidationError,
+    NumValue, ReferenceAction, SimpleColumnType, StrOrBoolOrArray, StringOrBool, TableConstraint,
+    TableDef, TableName, TableValidationError,
 };

crates/vespertide-core/src/lib.rs

@@ -2,8 +2,10 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::schema::{
-    foreign_key::ForeignKeySyntax, names::ColumnName, primary_key::PrimaryKeySyntax,
-    str_or_bool::StrOrBoolOrArray,
+    foreign_key::ForeignKeySyntax,
+    names::ColumnName,
+    primary_key::PrimaryKeySyntax,
+    str_or_bool::{StrOrBoolOrArray, StringOrBool},
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
@@ -13,7 +15,7 @@ pub struct ColumnDef {
     pub r#type: ColumnType,
     pub nullable: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub default: Option<String>,
+    pub default: Option<StringOrBool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub comment: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]

crates/vespertide-core/src/schema/column.rs

@@ -16,5 +16,5 @@ pub use index::IndexDef;
 pub use names::{ColumnName, IndexName, TableName};
 pub use primary_key::PrimaryKeyDef;
 pub use reference::ReferenceAction;
-pub use str_or_bool::StrOrBoolOrArray;
+pub use str_or_bool::{StrOrBoolOrArray, StringOrBool};
 pub use table::{TableDef, TableValidationError};

crates/vespertide-core/src/schema/mod.rs

@@ -8,3 +8,81 @@ pub enum StrOrBoolOrArray {
     Array(Vec<String>),
     Bool(bool),
 }
+
+/// A value that can be either a string or a boolean.
+/// This is used for default values where boolean columns can use `true`/`false` directly.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum StringOrBool {
+    Bool(bool),
+    String(String),
+}
+
+impl StringOrBool {
+    /// Convert to SQL string representation
+    pub fn to_sql(&self) -> String {
+        match self {
+            StringOrBool::Bool(b) => b.to_string(),
+            StringOrBool::String(s) => s.clone(),
+        }
+    }
+}
+
+impl From<bool> for StringOrBool {
+    fn from(b: bool) -> Self {
+        StringOrBool::Bool(b)
+    }
+}
+
+impl From<String> for StringOrBool {
+    fn from(s: String) -> Self {
+        StringOrBool::String(s)
+    }
+}
+
+impl From<&str> for StringOrBool {
+    fn from(s: &str) -> Self {
+        StringOrBool::String(s.to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_string_or_bool_to_sql_bool() {
+        let val = StringOrBool::Bool(true);
+        assert_eq!(val.to_sql(), "true");
+
+        let val = StringOrBool::Bool(false);
+        assert_eq!(val.to_sql(), "false");
+    }
+
+    #[test]
+    fn test_string_or_bool_to_sql_string() {
+        let val = StringOrBool::String("hello".into());
+        assert_eq!(val.to_sql(), "hello");
+    }
+
+    #[test]
+    fn test_string_or_bool_from_bool() {
+        let val: StringOrBool = true.into();
+        assert_eq!(val, StringOrBool::Bool(true));
+
+        let val: StringOrBool = false.into();
+        assert_eq!(val, StringOrBool::Bool(false));
+    }
+
+    #[test]
+    fn test_string_or_bool_from_string() {
+        let val: StringOrBool = String::from("test").into();
+        assert_eq!(val, StringOrBool::String("test".into()));
+    }
+
+    #[test]
+    fn test_string_or_bool_from_str() {
+        let val: StringOrBool = "test".into();
+        assert_eq!(val, StringOrBool::String("test".into()));
+    }
+}

crates/vespertide-core/src/schema/str_or_bool.rs

@@ -2,7 +2,8 @@ use std::collections::HashSet;
 
 use crate::orm::OrmExporter;
 use vespertide_core::{
-    ColumnDef, ColumnType, ComplexColumnType, EnumValues, NumValue, TableConstraint, TableDef,
+    ColumnDef, ColumnType, ComplexColumnType, EnumValues, NumValue, StringOrBool, TableConstraint,
+    TableDef,
 };
 
 pub struct SeaOrmExporter;
@@ -180,8 +181,15 @@ fn render_column(
 
 /// Format default value for SeaORM attribute.
 /// Returns the full attribute string like `default_value = "..."` or `default_value = 0`.
-fn format_default_value(value: &str, column_type: &ColumnType) -> String {
-    let trimmed = value.trim();
+fn format_default_value(value: &StringOrBool, column_type: &ColumnType) -> String {
+    // Handle boolean values directly
+    if let StringOrBool::Bool(b) = value {
+        return format!("default_value = {}", b);
+    }
+
+    // For string values, process as before
+    let value_str = value.to_sql();
+    let trimmed = value_str.trim();
 
     // Remove surrounding single quotes if present (SQL string literals)
     let cleaned = if trimmed.starts_with('\'') && trimmed.ends_with('\'') && trimmed.len() >= 2 {
@@ -2214,4 +2222,51 @@ mod tests {
             assert_snapshot!(rendered);
         });
     }
+
+    #[test]
+    fn test_boolean_default_value_with_bool_type() {
+        use vespertide_core::schema::primary_key::PrimaryKeySyntax;
+        let table = TableDef {
+            name: "settings".into(),
+            columns: vec![
+                ColumnDef {
+                    name: "id".into(),
+                    r#type: ColumnType::Simple(SimpleColumnType::Integer),
+                    nullable: false,
+                    default: None,
+                    comment: None,
+                    primary_key: Some(PrimaryKeySyntax::Bool(true)),
+                    unique: None,
+                    index: None,
+                    foreign_key: None,
+                },
+                ColumnDef {
+                    name: "is_active".into(),
+                    r#type: ColumnType::Simple(SimpleColumnType::Boolean),
+                    nullable: false,
+                    default: Some(StringOrBool::Bool(true)),
+                    comment: None,
+                    primary_key: None,
+                    unique: None,
+                    index: None,
+                    foreign_key: None,
+                },
+                ColumnDef {
+                    name: "is_deleted".into(),
+                    r#type: ColumnType::Simple(SimpleColumnType::Boolean),
+                    nullable: false,
+                    default: Some(StringOrBool::Bool(false)),
+                    comment: None,
+                    primary_key: None,
+                    unique: None,
+                    index: None,
+                    foreign_key: None,
+                },
+            ],
+            constraints: vec![],
+        };
+        let rendered = render_entity(&table);
+        assert!(rendered.contains("default_value = true"));
+        assert!(rendered.contains("default_value = false"));
+    }
 }

crates/vespertide-exporter/src/seaorm/mod.rs

@@ -90,7 +90,7 @@ pub fn build_add_column(
         let fill_expr = if let Some(fill) = fill_with {
             Expr::cust(fill)
         } else if let Some(def) = &column.default {
-            Expr::cust(def)
+            Expr::cust(def.to_sql())
         } else {
             Expr::cust("NULL")
         };

crates/vespertide-query/src/sql/add_column.rs

@@ -185,7 +185,8 @@ pub fn build_sea_column_def_with_table(
     }
 
     if let Some(default) = &column.default {
-        let converted = convert_default_for_backend(default, backend);
+        let default_str = default.to_sql();
+        let converted = convert_default_for_backend(&default_str, backend);
         col.default(Into::<SimpleExpr>::into(sea_query::Expr::cust(converted)));
     }
 

crates/vespertide-query/src/sql/helpers.rs

@@ -43,9 +43,13 @@
           ]
         },
         "default": {
-          "type": [
-            "string",
-            "null"
+          "anyOf": [
+            {
+              "$ref": "#/$defs/StringOrBool"
+            },
+            {
+              "type": "null"
+            }
           ]
         },
         "foreign_key": {
@@ -597,6 +601,17 @@
         }
       ]
     },
+    "StringOrBool": {
+      "description": "A value that can be either a string or a boolean.\nThis is used for default values where boolean columns can use `true`/`false` directly.",
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "TableConstraint": {
       "oneOf": [
         {