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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions absurd-sqlite-extension/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::env;
use std::fmt::Write;
use std::fs;
use std::path::{Path, PathBuf};
use std::process::Command;

#[derive(Debug)]
struct MigrationFile {
Expand All @@ -28,6 +29,23 @@ fn main() {
let migrations_dir = manifest_dir.join("migrations");
println!("cargo:rerun-if-changed={}", migrations_dir.display());

// Capture git commit hash
let git_commit = Command::new("git")
.args(["rev-parse", "--short", "HEAD"])
.output()
.ok()
.and_then(|output| {
if output.status.success() {
String::from_utf8(output.stdout).ok()
} else {
None
}
})
.map(|s| s.trim().to_string())
.unwrap_or_else(|| "unknown".to_string());

println!("cargo:rustc-env=GIT_COMMIT={}", git_commit);

let default_version = env::var("CARGO_PKG_VERSION").unwrap_or_else(|_| "0.0.0".to_string());
let mut migrations: Vec<MigrationFile> = Vec::new();

Expand Down
14 changes: 10 additions & 4 deletions absurd-sqlite-extension/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ mod validate;

fn absurd_version(context: *mut sqlite3_context, _values: &[*mut sqlite3_value]) -> Result<()> {
let version = env!("CARGO_PKG_VERSION");
sqlite_loadable::api::result_text(context, format!("absurd-sqlite/{}", version))?;
let git_commit = env!("GIT_COMMIT");
sqlite_loadable::api::result_text(
context,
format!("absurd-sqlite/{} ({})", version, git_commit),
)?;
Ok(())
}

Expand Down Expand Up @@ -241,10 +245,12 @@ mod tests {
.query_row("select absurd_version()", [], |row| row.get(0))
.unwrap();

assert_eq!(
result,
format!("absurd-sqlite/{}", env!("CARGO_PKG_VERSION"))
let expected = format!(
"absurd-sqlite/{} ({})",
env!("CARGO_PKG_VERSION"),
env!("GIT_COMMIT")
);
assert_eq!(result, expected);
}

#[test]
Expand Down