aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-31 05:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): .tables and .indexes dot commands should show tables and indexes from attached databases

Browse Source
This commit is contained in:
Konstantinos Artopoulos
2025-10-08 00:16:33 +03:00
parent 8bdef12e15
commit 7b17c824fb
1 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
cli/app.rs
View File

@@ -1239,26 +1239,33 @@ impl Limbo {
}
fn display_indexes(&mut self, maybe_table: Option<String>) -> anyhow::Result<()> {
let sql = match maybe_table {
Some(ref tbl_name) => format!(
"SELECT name FROM sqlite_schema WHERE type='index' AND tbl_name = '{tbl_name}' ORDER BY 1"
),
None => String::from("SELECT name FROM sqlite_schema WHERE type='index' ORDER BY 1"),
};
let mut indexes = String::new();
let handler = |row: &turso_core::Row| -> anyhow::Result<()> {
if let Ok(Value::Text(idx)) = row.get::<&Value>(0) {
indexes.push_str(idx.as_str());
indexes.push(' ');
}
Ok(())
};
if let Err(err) = self.handle_row(&sql, handler) {
if err.to_string().contains("no such table: sqlite_schema") {
return Err(anyhow::anyhow!("Unable to access database schema. The database may be using an older SQLite version or may not be properly initialized."));
} else {
return Err(anyhow::anyhow!("Error querying schema: {}", err));
for name in self.database_names()? {
let prefix = (name != "main").then_some(&name);
let sql = match maybe_table {
Some(ref tbl_name) => format!(
"SELECT name FROM {name}.sqlite_schema WHERE type='index' AND tbl_name = '{tbl_name}' ORDER BY 1"
),
None => format!("SELECT name FROM {name}.sqlite_schema WHERE type='index' ORDER BY 1"),
};
let handler = |row: &turso_core::Row| -> anyhow::Result<()> {
if let Ok(Value::Text(idx)) = row.get::<&Value>(0) {
if let Some(prefix) = prefix {
indexes.push_str(prefix);
indexes.push('.');
}
indexes.push_str(idx.as_str());
indexes.push(' ');
}
Ok(())
};
if let Err(err) = self.handle_row(&sql, handler) {
if err.to_string().contains("no such table: sqlite_schema") {
return Err(anyhow::anyhow!("Unable to access database schema. The database may be using an older SQLite version or may not be properly initialized."));
} else {
return Err(anyhow::anyhow!("Error querying schema: {}", err));
}
}
}
if !indexes.is_empty() {
@@ -1268,28 +1275,35 @@ impl Limbo {
}
fn display_tables(&mut self, pattern: Option<&str>) -> anyhow::Result<()> {
let sql = match pattern {
Some(pattern) => format!(
"SELECT name FROM sqlite_schema WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name LIKE '{pattern}' ORDER BY 1"
),
None => String::from(
"SELECT name FROM sqlite_schema WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY 1"
),
};
let mut tables = String::new();
let handler = |row: &turso_core::Row| -> anyhow::Result<()> {
if let Ok(Value::Text(table)) = row.get::<&Value>(0) {
tables.push_str(table.as_str());
tables.push(' ');
}
Ok(())
};
if let Err(e) = self.handle_row(&sql, handler) {
if e.to_string().contains("no such table: sqlite_schema") {
return Err(anyhow::anyhow!("Unable to access database schema. The database may be using an older SQLite version or may not be properly initialized."));
} else {
return Err(anyhow::anyhow!("Error querying schema: {}", e));
for name in self.database_names()? {
let prefix = (name != "main").then_some(&name);
let sql = match pattern {
Some(pattern) => format!(
"SELECT name FROM {name}.sqlite_schema WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name LIKE '{pattern}' ORDER BY 1"
),
None => format!(
"SELECT name FROM {name}.sqlite_schema WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY 1"
),
};
let handler = |row: &turso_core::Row| -> anyhow::Result<()> {
if let Ok(Value::Text(table)) = row.get::<&Value>(0) {
if let Some(prefix) = prefix {
tables.push_str(prefix);
tables.push('.');
}
tables.push_str(table.as_str());
tables.push(' ');
}
Ok(())
};
if let Err(e) = self.handle_row(&sql, handler) {
if e.to_string().contains("no such table: sqlite_schema") {
return Err(anyhow::anyhow!("Unable to access database schema. The database may be using an older SQLite version or may not be properly initialized."));
} else {
return Err(anyhow::anyhow!("Error querying schema: {}", e));
}
}
}
if !tables.is_empty() {
@@ -1304,6 +1318,21 @@ impl Limbo {
Ok(())
}
fn database_names(&mut self) -> anyhow::Result<Vec<String>> {
let sql = "PRAGMA database_list";
let mut db_names: Vec<String> = Vec::new();
let handler = |row: &turso_core::Row| -> anyhow::Result<()> {
if let Ok(Value::Text(name)) = row.get::<&Value>(1) {
db_names.push(name.to_string());
}
Ok(())
};
match self.handle_row(&sql, handler) {
Ok(_) => Ok(db_names),
Err(e) => Err(anyhow::anyhow!("Error in database list: {}", e)),
}
}
fn handle_row<F>(&mut self, sql: &str, mut handler: F) -> anyhow::Result<()>
where
F: FnMut(&turso_core::Row) -> anyhow::Result<()>,