aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 08:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: Add default column name

Browse Source
This commit is contained in:
wyhaya
2025-02-11 07:03:51 +00:00
parent cd27068807
commit 351a032cc1
5 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/go/rs_src/rows.rs
View File

@@ -115,12 +115,7 @@ pub extern "C" fn rows_get_column_name(rows_ptr: *mut c_void, idx: i32) -> *cons
return std::ptr::null_mut();
}
let name = rows.stmt.get_column_name(idx as usize);
let cstr = std::ffi::CString::new(
name.as_ref()
.unwrap_or(&&format!("column_{}", idx))
.as_bytes(),
)
.expect("Failed to create CString");
let cstr = std::ffi::CString::new(name.as_bytes()).expect("Failed to create CString");
cstr.into_raw() as *const c_char
}

9
bindings/java/rs_src/limbo_statement.rs
View File

@@ -138,11 +138,10 @@ pub extern "system" fn Java_org_github_tursodatabase_core_LimboStatement_columns
.unwrap();
for i in 0..num_columns {
if let Some(column_name) = stmt.stmt.get_column_name(i) {
let str = env.new_string(column_name).unwrap();
env.set_object_array_element(&obj_arr, i as i32, str)
.unwrap();
}
let column_name = stmt.stmt.get_column_name(i);
let str = env.new_string(column_name.as_str()).unwrap();
env.set_object_array_element(&obj_arr, i as i32, str)
.unwrap();
}
obj_arr.into()

2
cli/app.rs
View File

@@ -686,7 +686,7 @@ impl Limbo {
if rows.num_columns() > 0 {
let header = (0..rows.num_columns())
.map(|i| {
let name = rows.get_column_name(i).cloned().unwrap_or_default();
let name = rows.get_column_name(i);
Cell::new(name).add_attribute(Attribute::Bold)
})
.collect::<Vec<_>>();

9
core/lib.rs
View File

@@ -32,6 +32,7 @@ use log::trace;
use parking_lot::RwLock;
use schema::{Column, Schema};
use sqlite3_parser::{ast, ast::Cmd, lexer::sql::Parser};
use std::borrow::Cow;
use std::cell::Cell;
use std::collections::HashMap;
use std::num::NonZero;
@@ -485,8 +486,12 @@ impl Statement {
self.program.result_columns.len()
}
pub fn get_column_name(&self, idx: usize) -> Option<&String> {
self.program.result_columns[idx].name(&self.program.table_references)
pub fn get_column_name(&self, idx: usize) -> Cow<String> {
let column = &self.program.result_columns[idx];
match column.name(&self.program.table_references) {
Some(name) => Cow::Borrowed(name),
None => Cow::Owned(column.expr.to_string()),
}
}
pub fn parameters(&self) -> &parameters::Parameters {

10
tests/integration/common.rs
View File

@@ -99,16 +99,16 @@ mod tests {
let columns = stmt.num_columns();
assert_eq!(columns, 3);
assert_eq!(stmt.get_column_name(0), Some(&"foo".to_string()));
assert_eq!(stmt.get_column_name(1), Some(&"bar".to_string()));
assert_eq!(stmt.get_column_name(2), Some(&"baz".to_string()));
assert_eq!(stmt.get_column_name(0), "foo".into());
assert_eq!(stmt.get_column_name(1), "bar".into());
assert_eq!(stmt.get_column_name(2), "baz".into());
let stmt = conn.prepare("select foo, bar from test;")?;
let columns = stmt.num_columns();
assert_eq!(columns, 2);
assert_eq!(stmt.get_column_name(0), Some(&"foo".to_string()));
assert_eq!(stmt.get_column_name(1), Some(&"bar".to_string()));
assert_eq!(stmt.get_column_name(0), "foo".into());
assert_eq!(stmt.get_column_name(1), "bar".into());
let stmt = conn.prepare("delete from test;")?;
let columns = stmt.num_columns();