robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

allow running sql queries directly from cli

Browse source
This commit is contained in:
Robin Appelman 2025-04-03 15:14:07 +02:00
commit 37849081be
4 changed files with 170 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/args.rs
View file

@ -31,7 +31,11 @@ pub enum HazeArgs {
command: Vec<String>,
},
/// Connect to the database of an instance
Db { filter: Option<String>, root: bool },
Db {
filter: Option<String>,
root: bool,
command: Vec<String>,
},
/// Remove all non-pinned instances
Clean,
/// View the logs from an instance or service
@ -178,10 +182,24 @@ impl HazeArgs {
filter,
command: args.map(S::into).collect(),
}),
HazeCommand::Db => Ok(HazeArgs::Db {
HazeCommand::Db => {
let mut args = args.peekable();
let root = if let Some(first) = args.peek() {
let root = first.as_ref() == "root";
if root {
let _ = args.next();
}
root
} else {
false
};
let command = args.map(S::into).collect();
Ok(HazeArgs::Db {
filter,
root: args.next().filter(|arg| arg.as_ref() == "root").is_some(),
}),
root,
command,
})
}
HazeCommand::Clean => Ok(HazeArgs::Clean),
HazeCommand::Logs => {
let mut args = args.peekable();
@ -338,7 +356,36 @@ fn test_arg_parse() {
HazeArgs::parse(&[], vec!["haze", "asdasd", "db"].into_iter()).unwrap(),
HazeArgs::Db {
filter: Some("asdasd".to_string()),
root: false
root: false,
command: Vec::new()
}
);
assert_eq!(
HazeArgs::parse(&[], vec!["haze", "asdasd", "db", "root"].into_iter()).unwrap(),
HazeArgs::Db {
filter: Some("asdasd".to_string()),
root: true,
command: Vec::new()
}
);
assert_eq!(
HazeArgs::parse(&[], vec!["haze", "asdasd", "db", "select", "1"].into_iter()).unwrap(),
HazeArgs::Db {
filter: Some("asdasd".to_string()),
root: false,
command: vec!["select".to_string(), "1".to_string()]
}
);
assert_eq!(
HazeArgs::parse(
&[],
vec!["haze", "asdasd", "db", "root", "select 1"].into_iter()
)
.unwrap(),
HazeArgs::Db {
filter: Some("asdasd".to_string()),
root: true,
command: vec!["select 1".to_string()]
}
);
assert_eq!(

67
src/database.rs
View file

@ -265,7 +265,15 @@ impl Database {
}
}
pub async fn exec(&self, docker: &Docker, cloud_id: &str, root: bool) -> Result<ExitCode> {
pub async fn exec(
&self,
docker: &Docker,
cloud_id: &str,
root: bool,
command: &[String],
) -> Result<ExitCode> {
let command = command.join(" ");
if command.is_empty() {
match self.family() {
DatabaseFamily::Sqlite => {
exec_tty(
@ -314,6 +322,63 @@ impl Database {
.await
}
}
} else {
let stdout = stdout();
match self.family() {
DatabaseFamily::Sqlite => {
exec(
docker,
cloud_id,
"haze",
vec!["sqlite3", "/var/www/html/data/haze.db", "-cmd", &command],
Vec::<String>::default(),
Some(stdout),
)
.await
}
DatabaseFamily::MariaDB | DatabaseFamily::Mysql => {
exec(
docker,
format!("{}-db", cloud_id),
"mysql",
vec![
"mysql",
"-u",
if root { "root" } else { "haze" },
"-phaze",
"haze",
"-e",
&command,
],
Vec::<String>::default(),
Some(stdout),
)
.await
}
DatabaseFamily::Postgres => {
exec(
docker,
format!("{}-db", cloud_id),
"root",
vec!["psql", "haze", "haze", "-c", &command],
vec!["PGPASSWORD=haze"],
Some(stdout),
)
.await
}
DatabaseFamily::Oracle => {
exec(
docker,
format!("{}-db", cloud_id),
"root",
vec!["sqlplus", "system/haze"],
Vec::<String>::default(),
Some(stdout),
)
.await
}
}
}
}
pub async fn wait_for_start(&self, docker: &Docker, cloud_id: &str) -> Result<()> {

8
src/main.rs
View file

@ -160,9 +160,13 @@ async fn main() -> Result<ExitCode> {
)
.await?;
}
HazeArgs::Db { filter, root } => {
HazeArgs::Db {
filter,
root,
command,
} => {
let cloud = Cloud::get_by_filter(&docker, filter, &config).await?;
cloud.db().exec(&docker, &cloud.id, root).await?;
cloud.db().exec(&docker, &cloud.id, root, &command).await?;
}
HazeArgs::Open { filter } => {
let cloud = Cloud::get_by_filter(&docker, filter, &config).await?;

2
src/proxy.rs
View file

@ -226,7 +226,7 @@ async fn handler(State(state): State<AppState>, mut req: Request) -> Result<Resp
)
.await
{
Ok(response) => Ok(response.map(|body| Body::new(body))),
Ok(response) => Ok(response.map(Body::new)),
Err(error) => {
error!(%error, "error while proxying request");
Ok(StatusCode::BAD_REQUEST.into_response())