Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump connector_arrow from 0.3.0 to 0.4.0 #4308

Merged
merged 2 commits into from
Apr 14, 2024
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
16 changes: 5 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lutra/lutra/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ required-features = ["cli"]
anyhow = {workspace = true}
arrow = {version = "49.0", features = ["prettyprint"], default-features = false}
clap = {version = "4.4.18", features = ["derive"], optional = true}
connector_arrow = {version = "0.3.0", features = ["src_sqlite"]}
connector_arrow = {version = "0.4.0", features = ["src_sqlite"]}
env_logger = "0.10.2"
itertools = {workspace = true}
log = {workspace = true}
Expand Down
5 changes: 3 additions & 2 deletions lutra/lutra/src/connection.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use std::path::Path;

use anyhow::Result;
use connector_arrow::sqlite::SQLiteConnection;

use crate::project::DatabaseModule;

pub fn open(db: &DatabaseModule, project_root: &Path) -> Result<rusqlite::Connection> {
pub fn open(db: &DatabaseModule, project_root: &Path) -> Result<SQLiteConnection> {
// convert relative to absolute path
let mut sqlite_file_abs = project_root.to_path_buf();
sqlite_file_abs.push(&db.connection_params.file_relative);
Expand All @@ -13,5 +14,5 @@ pub fn open(db: &DatabaseModule, project_root: &Path) -> Result<rusqlite::Connec
// init SQLite
let sqlite_conn = rusqlite::Connection::open(sqlite_file_abs)?;

Ok(sqlite_conn)
Ok(SQLiteConnection::new(sqlite_conn))
}
2 changes: 1 addition & 1 deletion lutra/lutra/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn execute_one(project: &ProjectCompiled, pipeline_ident: &Ident) -> Result<Rela
};
log::debug!("executing sql: {pipeline}");

let batches = connector_arrow::query_one(&mut conn, pipeline)?;
let batches = connector_arrow::query(&mut conn, pipeline)?;

Ok(batches)
}
Loading