diff --git a/NAMESPACE b/NAMESPACE index e0c93fb5..3c49b34f 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -88,9 +88,9 @@ S3method(ungroup,duckplyr_df) S3method(union,duckplyr_df) S3method(union_all,duckplyr_df) export(as_duckplyr_df) -export(duckdb_from_csv) +export(duckdb_from_file) export(duckdb_rel_from_df) -export(duckplyr_df_from_csv) +export(duckplyr_df_from_file) export(is_duckplyr_df) export(methods_overwrite) export(methods_restore) diff --git a/R/csv.R b/R/csv.R index 7be2a584..ee8b9cdd 100644 --- a/R/csv.R +++ b/R/csv.R @@ -1,13 +1,13 @@ #' @export -duckdb_from_csv <- function(path) { +duckdb_from_file <- function(path, table_function, options=list()) { # FIXME: For some reason, it's important to create an alias here con <- get_default_duckdb_connection() out <- duckdb:::rel_from_table_function( con, - 'read_csv_auto', + table_function, list(path), - list() + options ) meta_rel_register_csv(out, path) @@ -16,7 +16,7 @@ duckdb_from_csv <- function(path) { } #' @export -duckplyr_df_from_csv <- function(path) { - out <- duckdb_from_csv(path) +duckplyr_df_from_file <- function(path, table_function, options=list()) { + out <- duckdb_from_file(path, table_function, options) as_duckplyr_df(out) }