chore: Replace Rcpp by cpp11

.Rbuildignore

@@ -26,3 +26,4 @@ windows
 ^\.gitpod\.yml$
 ^\.gitpod\.Dockerfile$
 ^CMakeLists\.txt$
+^vscode-install\.r$

DESCRIPTION

@@ -26,7 +26,6 @@ Imports:
     hms (>= 1.0.0),
     lubridate,
     methods,
-    Rcpp (>= 1.0.7),
     withr
 Suggests: 
     callr,
@@ -36,8 +35,8 @@ Suggests:
     rmarkdown,
     testthat (>= 3.0.0)
 LinkingTo: 
-    plogr (>= 0.2.0),
-    Rcpp
+    cpp11,
+    plogr (>= 0.2.0)
 VignetteBuilder:
     knitr
 Config/autostyle/scope: line_breaks
@@ -47,15 +46,15 @@ Encoding: UTF-8
 LazyLoad: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.3
-SystemRequirements: libpq >= 9.0: libpq-dev (deb) or postgresql-devel
-    (rpm)
+SystemRequirements: 
+    libpq >= 9.0: libpq-dev (deb) or postgresql-devel (rpm)
 Collate: 
     'PqDriver.R'
     'PqConnection.R'
     'PqResult.R'
     'RPostgres-pkg.R'
-    'RcppExports.R'
     'Redshift.R'
+    'cpp11.R'
     'dbAppendTable_PqConnection.R'
     'dbBegin_PqConnection.R'
     'dbBind_PqResult.R'

NAMESPACE

@@ -56,7 +56,6 @@ exportMethods(show)
 exportMethods(sqlData)
 import(DBI)
 import(methods)
-importFrom(Rcpp,sourceCpp)
 importFrom(bit64,integer64)
 importFrom(blob,blob)
 importFrom(hms,hms)

R/PqDriver.R

@@ -2,7 +2,6 @@
 #'
 #' @export
 #' @useDynLib RPostgres, .registration = TRUE
-#' @importFrom Rcpp sourceCpp
 #' @import methods DBI
 Postgres <- function() {
   new("PqDriver")

R/cpp11.R

@@ -0,0 +1,105 @@
+# Generated by cpp11: do not edit by hand
+
+client_version <- function() {
+  .Call(`_RPostgres_client_version`)
+}
+
+connection_create <- function(keys, values, check_interrupts) {
+  .Call(`_RPostgres_connection_create`, keys, values, check_interrupts)
+}
+
+connection_valid <- function(con_) {
+  .Call(`_RPostgres_connection_valid`, con_)
+}
+
+connection_release <- function(con_) {
+  invisible(.Call(`_RPostgres_connection_release`, con_))
+}
+
+connection_info <- function(con) {
+  .Call(`_RPostgres_connection_info`, con)
+}
+
+connection_quote_string <- function(con, xs) {
+  .Call(`_RPostgres_connection_quote_string`, con, xs)
+}
+
+connection_quote_identifier <- function(con, xs) {
+  .Call(`_RPostgres_connection_quote_identifier`, con, xs)
+}
+
+connection_is_transacting <- function(con) {
+  .Call(`_RPostgres_connection_is_transacting`, con)
+}
+
+connection_set_transacting <- function(con, transacting) {
+  invisible(.Call(`_RPostgres_connection_set_transacting`, con, transacting))
+}
+
+connection_copy_data <- function(con, sql, df) {
+  invisible(.Call(`_RPostgres_connection_copy_data`, con, sql, df))
+}
+
+connection_wait_for_notify <- function(con, timeout_secs) {
+  .Call(`_RPostgres_connection_wait_for_notify`, con, timeout_secs)
+}
+
+connection_get_temp_schema <- function(con) {
+  .Call(`_RPostgres_connection_get_temp_schema`, con)
+}
+
+connection_set_temp_schema <- function(con, temp_schema) {
+  invisible(.Call(`_RPostgres_connection_set_temp_schema`, con, temp_schema))
+}
+
+encode_vector <- function(x) {
+  .Call(`_RPostgres_encode_vector`, x)
+}
+
+encode_data_frame <- function(x) {
+  .Call(`_RPostgres_encode_data_frame`, x)
+}
+
+encrypt_password <- function(password, user) {
+  .Call(`_RPostgres_encrypt_password`, password, user)
+}
+
+init_logging <- function(log_level) {
+  invisible(.Call(`_RPostgres_init_logging`, log_level))
+}
+
+result_create <- function(con, sql, immediate) {
+  .Call(`_RPostgres_result_create`, con, sql, immediate)
+}
+
+result_release <- function(res) {
+  invisible(.Call(`_RPostgres_result_release`, res))
+}
+
+result_valid <- function(res_) {
+  .Call(`_RPostgres_result_valid`, res_)
+}
+
+result_fetch <- function(res, n) {
+  .Call(`_RPostgres_result_fetch`, res, n)
+}
+
+result_bind <- function(res, params) {
+  invisible(.Call(`_RPostgres_result_bind`, res, params))
+}
+
+result_has_completed <- function(res) {
+  .Call(`_RPostgres_result_has_completed`, res)
+}
+
+result_rows_fetched <- function(res) {
+  .Call(`_RPostgres_result_rows_fetched`, res)
+}
+
+result_rows_affected <- function(res) {
+  .Call(`_RPostgres_result_rows_affected`, res)
+}
+
+result_column_info <- function(res) {
+  .Call(`_RPostgres_result_column_info`, res)
+}

src/CMakeLists.txt

@@ -37,7 +37,7 @@ add_library(RPostgres
   PqUtils.h
   RPostgres-init.c
   RPostgres_types.h
-  RcppExports.cpp
+  cpp11.cpp
   connection.cpp
   encode.cpp
   encode.h

src/DbColumn.cpp

@@ -29,7 +29,7 @@ void DbColumn::finalize(const int n_) {
   n = n_;
 }
 
-void DbColumn::warn_type_conflicts(const String& name) const {
+void DbColumn::warn_type_conflicts(const cpp11::r_string& name) const {
   std::set<DATA_TYPE> my_data_types_seen = data_types_seen;
   DATA_TYPE dt = get_last_storage()->get_data_type();
 
@@ -52,11 +52,8 @@ void DbColumn::warn_type_conflicts(const String& name) const {
 
   if (my_data_types_seen.size() == 0) return;
 
-  String name_utf8 = name;
-  name_utf8.set_encoding(CE_UTF8);
-
   std::stringstream ss;
-  ss << "Column `" << name_utf8.get_cstring() << "`: " <<
+  ss << "Column `" << static_cast<std::string>(name) << "`: " <<
      "mixed type, first seen values of type " << format_data_type(dt) << ", " <<
      "coercing other values of type ";
 
@@ -67,7 +64,7 @@ void DbColumn::warn_type_conflicts(const String& name) const {
     ss << format_data_type(*it);
   }
 
-  warning(ss.str());
+  cpp11::warning(ss.str());
 }
 
 DbColumn::operator SEXP() const {

src/DbColumn.h

@@ -1,6 +1,7 @@
 #ifndef DB_COLUMN_H
 #define DB_COLUMN_H
 
+#include <set>
 
 #include "DbColumnDataType.h"
 #include "DbColumnDataSourceFactory.h"
@@ -25,7 +26,7 @@ class DbColumn {
 public:
   void set_col_value();
   void finalize(const int n_);
-  void warn_type_conflicts(const String& name) const;
+  void warn_type_conflicts(const cpp11::r_string& name) const;
 
   operator SEXP() const;
   DATA_TYPE get_type() const;