Merge pull request #20 from dev-five-git/fix-query-builder

Fix query builder

Author: owjs3901

.changepacks/changepack_log_CDjntNpuuGDyO1BES5WxE.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch"},"note":"Optimize query","date":"2025-12-15T06:52:49.007765800Z"}

Cargo.lock

@@ -0,0 +1 @@
+src/models

crates/vespertide-cli/.gitignore

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/migration.schema.json",
+  "actions": [
+    {
+      "columns": [],
+      "constraints": [],
+      "table": "test_table",
+      "type": "create_table"
+    }
+  ],
+  "comment": "test message",
+  "created_at": "2025-12-15T06:12:57Z",
+  "version": 1
+}

crates/vespertide-cli/migrations/0001_test_message.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dev-five-git/vespertide/refs/heads/main/schemas/model.schema.json",
+  "columns": [],
+  "constraints": [],
+  "indexes": [],
+  "name": "test_table"
+}

crates/vespertide-cli/models/test_table.json

@@ -169,11 +169,7 @@ fn format_constraint_type(constraint: &vespertide_core::TableConstraint) -> Stri
             }
         }
         vespertide_core::TableConstraint::Check { name, expr } => {
-            if let Some(n) = name {
-                format!("{} CHECK ({})", n, expr)
-            } else {
-                format!("CHECK ({})", expr)
-            }
+            format!("{} CHECK ({})", name, expr)
         }
     }
 }
@@ -345,7 +341,7 @@ mod tests {
         MigrationAction::AddConstraint {
             table: "users".into(),
             constraint: vespertide_core::TableConstraint::Check {
-                name: Some("check_age".into()),
+                name: "check_age".into(),
                 expr: "age > 0".into(),
             },
         },
@@ -389,11 +385,17 @@ mod tests {
         MigrationAction::RemoveConstraint {
             table: "users".into(),
             constraint: vespertide_core::TableConstraint::Check {
-                name: None,
+                name: "check_age".into(),
                 expr: "age > 0".into(),
             },
         },
-        format!("{} {} {} {}", "Remove constraint:".bright_red(), "CHECK (age > 0)".bright_cyan().bold(), "from".bright_white(), "users".bright_cyan())
+        format!(
+            "{} {} {} {}",
+            "Remove constraint:".bright_red(),
+            "check_age CHECK (age > 0)".bright_cyan().bold(),
+            "from".bright_white(),
+            "users".bright_cyan()
+        )
     )]
     #[serial]
     fn format_action_cases(#[case] action: MigrationAction, #[case] expected: String) {

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

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use colored::Colorize;
-use vespertide_query::build_plan_queries;
+use vespertide_query::{DatabaseBackend, build_plan_queries};
 
 use crate::utils::load_migrations;
 
@@ -54,11 +54,9 @@ pub fn cmd_log() -> Result<()> {
             println!(
                 "    {}. {}",
                 (i + 1).to_string().bright_magenta().bold(),
-                q.sql.trim().bright_white()
+                q.build(DatabaseBackend::Postgres).trim().bright_white()
             );
-            if !q.binds.is_empty() {
-                println!("       {} {:?}", "binds:".bright_cyan(), q.binds);
-            }
+            println!("       {} {:?}", "binds:".bright_cyan(), q.binds());
         }
         println!();
     }

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

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use colored::Colorize;
 use vespertide_planner::plan_next_migration;
-use vespertide_query::build_plan_queries;
+use vespertide_query::{DatabaseBackend, build_plan_queries};
 
 use crate::utils::{load_config, load_migrations, load_models};
 
@@ -60,11 +60,9 @@ fn emit_sql(plan: &vespertide_core::MigrationPlan) -> Result<()> {
         println!(
             "{}. {}",
             (i + 1).to_string().bright_magenta().bold(),
-            q.sql.trim().bright_white()
+            q.build(DatabaseBackend::Postgres).trim().bright_white()
         );
-        if !q.binds.is_empty() {
-            println!("   {} {:?}", "binds:".bright_cyan(), q.binds);
-        }
+        println!("   {} {:?}", "binds:".bright_cyan(), q.binds());
     }
 
     Ok(())
@@ -137,31 +135,28 @@ mod tests {
         let tmp = tempdir().unwrap();
         let _guard = CwdGuard::new(&tmp.path().to_path_buf());
 
-        let cfg = write_config();
+        let _cfg = write_config();
         write_model("users");
-        fs::create_dir_all(cfg.migrations_dir()).unwrap();
 
+        // No migrations yet -> plan will create table
         let result = cmd_sql();
         assert!(result.is_ok());
     }
 
     #[test]
-    fn emit_sql_no_actions_early_return() {
+    #[serial]
+    fn cmd_sql_no_changes() {
+        let tmp = tempdir().unwrap();
+        let _guard = CwdGuard::new(&tmp.path().to_path_buf());
+
+        let cfg = write_config();
+        write_model("users");
+
+        // Create initial migration to establish baseline
         let plan = MigrationPlan {
             comment: None,
             created_at: None,
             version: 1,
-            actions: vec![],
-        };
-        assert!(emit_sql(&plan).is_ok());
-    }
-
-    #[test]
-    fn emit_sql_with_metadata() {
-        let plan = MigrationPlan {
-            comment: Some("init".into()),
-            created_at: Some("2024-01-01T00:00:00Z".into()),
-            version: 1,
             actions: vec![MigrationAction::CreateTable {
                 table: "users".into(),
                 columns: vec![ColumnDef {
@@ -181,6 +176,27 @@ mod tests {
                 }],
             }],
         };
-        assert!(emit_sql(&plan).is_ok());
+        fs::create_dir_all(cfg.migrations_dir()).unwrap();
+        let path = cfg.migrations_dir().join("0001_init.json");
+        fs::write(path, serde_json::to_string_pretty(&plan).unwrap()).unwrap();
+
+        let result = cmd_sql();
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    #[serial]
+    fn emit_sql_prints_created_at_and_comment() {
+        let plan = MigrationPlan {
+            comment: Some("with comment".into()),
+            created_at: Some("2024-01-02T00:00:00Z".into()),
+            version: 1,
+            actions: vec![MigrationAction::RawSql {
+                sql: "SELECT 1;".into(),
+            }],
+        };
+
+        let result = emit_sql(&plan);
+        assert!(result.is_ok());
     }
 }

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

@@ -0,0 +1,10 @@
+{
+  "modelsDir": "models",
+  "migrationsDir": "migrations",
+  "tableNamingCase": "snake",
+  "columnNamingCase": "snake",
+  "modelFormat": "json",
+  "migrationFormat": "json",
+  "migrationFilenamePattern": "%04v_%m",
+  "modelExportDir": "src/models"
+}

crates/vespertide-cli/vespertide.json

@@ -27,7 +27,7 @@ pub enum TableConstraint {
         on_update: Option<ReferenceAction>,
     },
     Check {
-        name: Option<String>,
+        name: String,
         expr: String,
     },
 }