CodeCow/roapi
1
0
Fork 0
mirror of https://github.com/roapi/roapi.git synced 2026-06-05 21:04:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: support loading database source in yaml config

Browse Source
This commit is contained in:
Qingping Hou 2022-08-08 00:55:48 -07:00
parent c88ce6059f
commit 2b03943480
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
columnq/src/table/mod.rs
View File

@ -412,23 +412,29 @@ impl TableSource {
Ok(match (&self.option, &self.io_source) {
(Some(opt), _) => opt.extension(),
(None, TableIoSource::Uri(uri)) => {
let ext = Path::new(uri)
.extension()
.and_then(OsStr::to_str)
.ok_or_else(|| {
ColumnQError::InvalidUri(format!(
"cannot detect table extension from uri: {}",
uri
))
})?;
match ext {
"csv" | "json" | "parquet" | "ndjson" | "arrow" | "arrows" => ext,
_ => {
return Err(ColumnQError::InvalidUri(format!(
"unsupported extension in uri: {}",
uri
)));
match Path::new(uri).extension().and_then(OsStr::to_str) {
Some(ext) => match ext {
"csv" | "json" | "parquet" | "ndjson" | "arrow" | "arrows" => ext,
_ => {
return Err(ColumnQError::InvalidUri(format!(
"unsupported extension in uri: {}",
uri
)));
}
},
None => {
// database sources doesn't have suffix extension, parse scheme instead
match TableSource::parse_option(&self.io_source) {
Some(TableLoadOption::mysql {}) => "mysql",
Some(TableLoadOption::sqlite {}) => "sqlite",
Some(TableLoadOption::postgres {}) => "postgres",
_ => {
return Err(ColumnQError::InvalidUri(format!(
"unsupported extension in uri: {}",
uri
)));
}
}
}
}
}
@ -472,6 +478,9 @@ pub async fn load(t: &TableSource) -> Result<Arc<dyn TableProvider>, ColumnQErro
"parquet" => parquet::to_datafusion_table(t).await?,
"arrow" => Arc::new(arrow_ipc_file::to_mem_table(t).await?),
"arrows" => Arc::new(arrow_ipc_stream::to_mem_table(t).await?),
"mysql" => Arc::new(database::DatabaseLoader::MySQL.to_mem_table(t)?),
"sqlite" => Arc::new(database::DatabaseLoader::SQLite.to_mem_table(t)?),
"postgresql" => Arc::new(database::DatabaseLoader::Postgres.to_mem_table(t)?),
ext => {
return Err(ColumnQError::InvalidUri(format!(
"failed to register `{}` as table `{}`, unsupported table format `{}`",