Merge pull request #28 from dev-five-git/exporter-issue

Exporter issue

Author: owjs3901

.changepacks/changepack_log_VBxNuIzZ8oAhXU1OCJ7ow.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch"},"note":"Add column validation","date":"2025-12-18T15:48:46.157103400Z"}

.changepacks/changepack_log_YlSdZ6-kG9UnxW5iK-l9X.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch"},"note":"Implement num_enum","date":"2025-12-18T15:48:35.861293400Z"}

.gitignore

@@ -1,3 +1,4 @@
-/target
-local.db
-settings.local.json
+/target
+local.db
+settings.local.json
+coverage

Cargo.lock

@@ -248,7 +248,7 @@ mod tests {
     #[case(
         MigrationAction::AddColumn {
             table: "users".into(),
-            column: ColumnDef {
+            column: Box::new(ColumnDef {
                 name: "name".into(),
                 r#type: ColumnType::Simple(SimpleColumnType::Text),
                 nullable: true,
@@ -258,7 +258,7 @@ mod tests {
                 unique: None,
                 index: None,
                 foreign_key: None,
-            },
+            }),
             fill_with: None,
         },
         format!("{} {}.{}", "Add column:".bright_green(), "users".bright_cyan(), "name".bright_cyan().bold())

crates/vespertide-cli/src/commands/diff.rs

@@ -7,7 +7,7 @@ use anyhow::{Context, Result};
 use clap::ValueEnum;
 use vespertide_config::VespertideConfig;
 use vespertide_core::TableDef;
-use vespertide_exporter::{Orm, render_entity};
+use vespertide_exporter::{Orm, render_entity_with_schema};
 
 use crate::utils::load_config;
 
@@ -51,8 +51,12 @@ pub fn cmd_export(orm: OrmArg, export_dir: Option<PathBuf>) -> Result<()> {
 
     let orm_kind: Orm = orm.into();
 
+    // Extract all tables for schema context (used for FK chain resolution)
+    let all_tables: Vec<TableDef> = normalized_models.iter().map(|(t, _)| t.clone()).collect();
+
     for (table, rel_path) in &normalized_models {
-        let code = render_entity(orm_kind, table).map_err(|e| anyhow::anyhow!(e))?;
+        let code = render_entity_with_schema(orm_kind, table, &all_tables)
+            .map_err(|e| anyhow::anyhow!(e))?;
         let out_path = build_output_path(&target_root, rel_path, orm_kind);
         if let Some(parent) = out_path.parent() {
             fs::create_dir_all(parent)

crates/vespertide-cli/src/commands/export.rs

@@ -431,7 +431,7 @@ mod tests {
             version: 1,
             actions: vec![MigrationAction::AddColumn {
                 table: "users".into(),
-                column: ColumnDef {
+                column: Box::new(ColumnDef {
                     name: "nickname".into(),
                     r#type: ColumnType::Simple(SimpleColumnType::Text),
                     nullable: false,
@@ -441,7 +441,7 @@ mod tests {
                     unique: None,
                     index: None,
                     foreign_key: None,
-                },
+                }),
                 fill_with: Some("default".into()),
             }],
         };

crates/vespertide-cli/src/commands/sql.rs

@@ -28,7 +28,7 @@ pub enum MigrationAction {
     },
     AddColumn {
         table: TableName,
-        column: ColumnDef,
+        column: Box<ColumnDef>,
         /// Optional fill value to backfill existing rows when adding NOT NULL without default.
         fill_with: Option<String>,
     },
@@ -194,7 +194,7 @@ mod tests {
     #[case::add_column(
         MigrationAction::AddColumn {
             table: "users".into(),
-            column: default_column(),
+            column: Box::new(default_column()),
             fill_with: None,
         },
         "AddColumn: users.email"

crates/vespertide-core/src/action.rs

@@ -1,10 +1,11 @@
-pub mod action;
-pub mod migration;
-pub mod schema;
-
-pub use action::{MigrationAction, MigrationPlan};
-pub use migration::{MigrationError, MigrationOptions};
-pub use schema::{
-    ColumnDef, ColumnName, ColumnType, ComplexColumnType, IndexDef, IndexName, ReferenceAction,
-    SimpleColumnType, StrOrBoolOrArray, TableConstraint, TableDef, TableName, TableValidationError,
-};
+pub mod action;
+pub mod migration;
+pub mod schema;
+
+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,
+};