version 0.7.1-1

Author: hannes

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: duckdb
 Title: DBI Package for the DuckDB Database Management System
-Version: 0.7.0
+Version: 0.7.1-1
 Authors@R: 
     c(person(given = "Hannes",
              family = "Mühleisen",
@@ -49,7 +49,7 @@ Suggests: arrow, bit64, callr, DBItest, dplyr, dbplyr, rlang, testthat,
 Encoding: UTF-8
 RoxygenNote: 7.2.3
 NeedsCompilation: yes
-Packaged: 2023-02-13 19:23:23 UTC; hannes
+Packaged: 2023-03-01 09:31:23 UTC; hannes
 Author: Hannes Mühleisen [aut, cre] (<https://orcid.org/0000-0001-8552-0029>),
   Mark Raasveldt [aut] (<https://orcid.org/0000-0001-5005-6844>),
   Stichting DuckDB Foundation [cph],
@@ -78,4 +78,4 @@ Author: Hannes Mühleisen [aut, cre] (<https://orcid.org/0000-0001-8552-0029>),
   PCG Project contributors [cph]
 Maintainer: Hannes Mühleisen <hannes@cwi.nl>
 Repository: CRAN
-Date/Publication: 2023-02-14 10:00:10 UTC
+Date/Publication: 2023-03-01 12:50:02 UTC

MD5

@@ -40,6 +40,11 @@ duckdb <- function(dbdir = DBDIR_MEMORY, read_only = FALSE, bigint = "numeric",
     stop(paste("Unsupported bigint configuration", bigint))
   )
 
+  # R packages are not allowed to write extensions into home directory, so use R_user_dir instead
+  if (!("extension_directory" %in% names(config))) {
+    config["extension_directory"] <- tools::R_user_dir("duckdb", "data")
+  }
+
   new(
     "duckdb_driver",
     database_ref = rapi_startup(dbdir, read_only, config),

R/Driver.R

@@ -144,12 +144,12 @@ rapi_release <- function(stmt) {
   invisible(.Call(`_duckdb_rapi_release`, stmt))
 }
 
-rapi_get_substrait <- function(conn, query) {
-  .Call(`_duckdb_rapi_get_substrait`, conn, query)
+rapi_get_substrait <- function(conn, query, enable_optimizer) {
+  .Call(`_duckdb_rapi_get_substrait`, conn, query, enable_optimizer)
 }
 
-rapi_get_substrait_json <- function(conn, query) {
-  .Call(`_duckdb_rapi_get_substrait_json`, conn, query)
+rapi_get_substrait_json <- function(conn, query, enable_optimizer) {
+  .Call(`_duckdb_rapi_get_substrait_json`, conn, query, enable_optimizer)
 }
 
 rapi_prepare_substrait <- function(conn, query) {

R/cpp11.R

@@ -0,0 +1,19 @@
+sql <- function(sql, conn = default_connection()) {
+  stopifnot(dbIsValid(conn))
+  dbGetQuery(conn, sql)
+}
+
+default_duckdb_connection <- new.env(parent=emptyenv())
+
+default_connection <- function() {
+  if(!exists("con", default_duckdb_connection)) {
+    con <- DBI::dbConnect(duckdb::duckdb())
+
+    default_duckdb_connection$con <- con
+
+    reg.finalizer(default_duckdb_connection, onexit = TRUE, function(e) {
+      DBI::dbDisconnect(e$con, shutdown = TRUE)
+    })
+  }
+  default_duckdb_connection$con
+}

R/sql.R

@@ -46,24 +46,25 @@ duckdb_prepare_substrait_json <- function(conn, json, arrow = FALSE) {
 #'
 #' @param conn A DuckDB connection, created by `dbConnect()`.
 #' @param query The query string in SQL
+#' @param enable_optimizer Optional parameter to enable/disable query-optimizer. By default optimizer is enabled.
 #' @return A raw vector containing the substrait protobuf blob
 #' @export
-duckdb_get_substrait <- function(conn, query) {
+duckdb_get_substrait <- function(conn, query, enable_optimizer = TRUE) {
   stopifnot(dbIsValid(conn))
   stopifnot(is.character(query))
-  rapi_get_substrait(conn@conn_ref, query)
+  rapi_get_substrait(conn@conn_ref, query, enable_optimizer)
 }
 
-
 #' Get the Substrait plan for a SQL query in the JSON format
 #' Transforms a SQL query into a vector containing the serialized Substrait query JSON
 #'
 #' @param conn A DuckDB connection, created by `dbConnect()`.
 #' @param query The query string in SQL
+#' @param enable_optimizer Optional parameter to enable/disable query-optimizer. By default optimizer is enabled.
 #' @return A vector containing the substrait protobuf JSON
 #' @export
-duckdb_get_substrait_json <- function(conn, query) {
+duckdb_get_substrait_json <- function(conn, query, enable_optimizer = TRUE) {
   stopifnot(dbIsValid(conn))
   stopifnot(is.character(query))
-  rapi_get_substrait_json(conn@conn_ref, query)
+  rapi_get_substrait_json(conn@conn_ref, query, enable_optimizer)
 }

R/substrait.R

@@ -57,8 +57,8 @@ class external_pointer {
 
   external_pointer(SEXP data) : data_(valid_type(data)) {}
 
-  external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true)
-      : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, R_NilValue)) {
+  external_pointer(pointer p, bool use_deleter = true, bool finalize_on_exit = true, SEXP prot = R_NilValue)
+      : data_(safe[R_MakeExternalPtr]((void*)p, R_NilValue, prot)) {
     if (use_deleter) {
       R_RegisterCFinalizerEx(data_, r_deleter, static_cast<r_bool>(finalize_on_exit));
     }

inst/include/cpp11/external_pointer.hpp

@@ -266,17 +266,17 @@ extern "C" SEXP _duckdb_rapi_release(SEXP stmt) {
   END_CPP11
 }
 // statement.cpp
-SEXP rapi_get_substrait(duckdb::conn_eptr_t conn, std::string query);
-extern "C" SEXP _duckdb_rapi_get_substrait(SEXP conn, SEXP query) {
+SEXP rapi_get_substrait(duckdb::conn_eptr_t conn, std::string query, bool enable_optimizer);
+extern "C" SEXP _duckdb_rapi_get_substrait(SEXP conn, SEXP query, SEXP enable_optimizer) {
   BEGIN_CPP11
-    return cpp11::as_sexp(rapi_get_substrait(cpp11::as_cpp<cpp11::decay_t<duckdb::conn_eptr_t>>(conn), cpp11::as_cpp<cpp11::decay_t<std::string>>(query)));
+    return cpp11::as_sexp(rapi_get_substrait(cpp11::as_cpp<cpp11::decay_t<duckdb::conn_eptr_t>>(conn), cpp11::as_cpp<cpp11::decay_t<std::string>>(query), cpp11::as_cpp<cpp11::decay_t<bool>>(enable_optimizer)));
   END_CPP11
 }
 // statement.cpp
-SEXP rapi_get_substrait_json(duckdb::conn_eptr_t conn, std::string query);
-extern "C" SEXP _duckdb_rapi_get_substrait_json(SEXP conn, SEXP query) {
+SEXP rapi_get_substrait_json(duckdb::conn_eptr_t conn, std::string query, bool enable_optimizer);
+extern "C" SEXP _duckdb_rapi_get_substrait_json(SEXP conn, SEXP query, SEXP enable_optimizer) {
   BEGIN_CPP11
-    return cpp11::as_sexp(rapi_get_substrait_json(cpp11::as_cpp<cpp11::decay_t<duckdb::conn_eptr_t>>(conn), cpp11::as_cpp<cpp11::decay_t<std::string>>(query)));
+    return cpp11::as_sexp(rapi_get_substrait_json(cpp11::as_cpp<cpp11::decay_t<duckdb::conn_eptr_t>>(conn), cpp11::as_cpp<cpp11::decay_t<std::string>>(query), cpp11::as_cpp<cpp11::decay_t<bool>>(enable_optimizer)));
   END_CPP11
 }
 // statement.cpp
@@ -349,8 +349,8 @@ static const R_CallMethodDef CallEntries[] = {
     {"_duckdb_rapi_expr_reference",         (DL_FUNC) &_duckdb_rapi_expr_reference,         2},
     {"_duckdb_rapi_expr_set_alias",         (DL_FUNC) &_duckdb_rapi_expr_set_alias,         2},
     {"_duckdb_rapi_expr_tostring",          (DL_FUNC) &_duckdb_rapi_expr_tostring,          1},
-    {"_duckdb_rapi_get_substrait",          (DL_FUNC) &_duckdb_rapi_get_substrait,          2},
-    {"_duckdb_rapi_get_substrait_json",     (DL_FUNC) &_duckdb_rapi_get_substrait_json,     2},
+    {"_duckdb_rapi_get_substrait",          (DL_FUNC) &_duckdb_rapi_get_substrait,          3},
+    {"_duckdb_rapi_get_substrait_json",     (DL_FUNC) &_duckdb_rapi_get_substrait_json,     3},
     {"_duckdb_rapi_prepare",                (DL_FUNC) &_duckdb_rapi_prepare,                2},
     {"_duckdb_rapi_prepare_substrait",      (DL_FUNC) &_duckdb_rapi_prepare_substrait,      2},
     {"_duckdb_rapi_prepare_substrait_json", (DL_FUNC) &_duckdb_rapi_prepare_substrait_json, 2},