Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .changepacks/changepack_log_9NxoUKdBORNMnyS1Yml7-.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch"},"note":"Support sqlite migration","date":"2025-12-16T14:09:11.883218100Z"}
1 change: 1 addition & 0 deletions .changepacks/changepack_log_oa3NjaHehmq88Zy2V57od.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch","crates/vespertide-planner/Cargo.toml":"Patch"},"note":"Convert default value","date":"2025-12-16T14:08:56.631935300Z"}
83 changes: 71 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ documentation = "https://docs.rs/vespertide"
[workspace.dependencies]
vespertide-core = { path = "crates/vespertide-core", version = "0.1.9" }
vespertide-config = { path = "crates/vespertide-config", version = "0.1.9" }
vespertide-loader = { path = "crates/vespertide-loader", version = "0.1.9" }
vespertide-macro = { path = "crates/vespertide-macro", version = "0.1.9" }
vespertide-planner = { path = "crates/vespertide-planner", version = "0.1.9" }
vespertide-query = { path = "crates/vespertide-query", version = "0.1.9" }
Expand Down
1 change: 1 addition & 0 deletions crates/vespertide-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ serde_yaml = "0.9"
schemars = "1.1"
vespertide-config = { workspace = true }
vespertide-core = { workspace = true }
vespertide-loader = { workspace = true }
vespertide-planner = { workspace = true }
vespertide-query = { workspace = true }
vespertide-exporter = { workspace = true }
Expand Down
7 changes: 5 additions & 2 deletions crates/vespertide-cli/src/commands/diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ mod tests {
use std::path::PathBuf;
use tempfile::tempdir;
use vespertide_config::VespertideConfig;
use vespertide_core::{ColumnDef, ColumnType, SimpleColumnType, TableDef};
use vespertide_core::{ColumnDef, ColumnType, SimpleColumnType, TableConstraint, TableDef};

struct CwdGuard {
original: PathBuf,
Expand Down Expand Up @@ -226,7 +226,10 @@ mod tests {
index: None,
foreign_key: None,
}],
constraints: vec![],
constraints: vec![TableConstraint::PrimaryKey {
auto_increment: false,
columns: vec!["id".into()],
}],
indexes: vec![],
};
let path = models_dir.join(format!("{name}.json"));
Expand Down
110 changes: 94 additions & 16 deletions crates/vespertide-cli/src/commands/log.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
use anyhow::Result;
use colored::Colorize;
use vespertide_loader::{load_config, load_models};
use vespertide_query::{DatabaseBackend, build_plan_queries};

use crate::utils::load_migrations;

pub fn cmd_log() -> Result<()> {
let plans = load_migrations(&crate::utils::load_config()?)?;
pub fn cmd_log(backend: DatabaseBackend) -> Result<()> {
let config = load_config()?;
let plans = load_migrations(&config)?;

if plans.is_empty() {
println!("{}", "No migrations found.".bright_yellow());
Expand All @@ -19,7 +21,7 @@ pub fn cmd_log() -> Result<()> {
plans.len().to_string().bright_yellow().bold()
);
println!();

let current_models = load_models(&config)?;
for plan in &plans {
println!(
"{} {}",
Expand All @@ -42,22 +44,42 @@ pub fn cmd_log() -> Result<()> {
plan.actions.len().to_string().bright_yellow()
);

let queries = build_plan_queries(plan)
let plan_queries = build_plan_queries(plan, &current_models)
.map_err(|e| anyhow::anyhow!("query build error for v{}: {}", plan.version, e))?;
println!(
" {} {}",
"SQL statements:".bright_cyan().bold(),
queries.len().to_string().bright_yellow().bold()
);

for (i, q) in queries.iter().enumerate() {
for (i, pq) in plan_queries.iter().enumerate() {
println!(
" {}. {}",
(i + 1).to_string().bright_magenta().bold(),
q.build(DatabaseBackend::Postgres).trim().bright_white()
match backend {
DatabaseBackend::Postgres => pq
.postgres
.iter()
.map(|q| q.build(DatabaseBackend::Postgres))
.collect::<Vec<_>>()
.join(";\n")
.trim()
.bright_white(),
DatabaseBackend::MySql => pq
.mysql
.iter()
.map(|q| q.build(DatabaseBackend::MySql))
.collect::<Vec<_>>()
.join(";\n")
.trim()
.bright_white(),
DatabaseBackend::Sqlite => pq
.sqlite
.iter()
.map(|q| q.build(DatabaseBackend::Sqlite))
.collect::<Vec<_>>()
.join(";\n")
.trim()
.bright_white(),
}
);
println!(" {} {:?}", "binds:".bright_cyan(), q.binds());
}

println!();
}

Expand Down Expand Up @@ -113,29 +135,85 @@ mod tests {

#[test]
#[serial_test::serial]
fn cmd_log_with_single_migration() {
fn cmd_log_with_single_migration_postgres() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
write_migration(&cfg);

let result = cmd_log();
let result = cmd_log(DatabaseBackend::Postgres);
assert!(result.is_ok());
}

#[test]
#[serial_test::serial]
fn cmd_log_with_single_migration_mysql() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
write_migration(&cfg);

let result = cmd_log(DatabaseBackend::MySql);
assert!(result.is_ok());
}

#[test]
#[serial_test::serial]
fn cmd_log_with_single_migration_sqlite() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
write_migration(&cfg);

let result = cmd_log(DatabaseBackend::Sqlite);
assert!(result.is_ok());
}

#[test]
#[serial_test::serial]
fn cmd_log_no_migrations_postgres() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
fs::create_dir_all(cfg.migrations_dir()).unwrap();

let result = cmd_log(DatabaseBackend::Postgres);
assert!(result.is_ok());
}

#[test]
#[serial_test::serial]
fn cmd_log_no_migrations_mysql() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
fs::create_dir_all(cfg.migrations_dir()).unwrap();

let result = cmd_log(DatabaseBackend::MySql);
assert!(result.is_ok());
}

#[test]
#[serial_test::serial]
fn cmd_log_no_migrations() {
fn cmd_log_no_migrations_sqlite() {
let tmp = tempdir().unwrap();
let _guard = CwdGuard::new(&tmp.path().to_path_buf());

let cfg = VespertideConfig::default();
write_config(&cfg);
fs::create_dir_all(cfg.migrations_dir()).unwrap();

let result = cmd_log();
let result = cmd_log(DatabaseBackend::Sqlite);
assert!(result.is_ok());
}
}
Loading