connection.cpp cpp11

r-dbi · krlmlr · Feb 13, 2023 · Jan 22, 2023 · Jan 22, 2023 · Jan 22, 2023
commit 88639d1d06e2eb7ecf17317590b1b2c955ebe996
diff --git a/src/connection.cpp b/src/connection.cpp
@@ -48,16 +48,16 @@ void connection_release(cpp11::external_pointer<DbConnectionPtr> con_) {
 }
 
 [[cpp11::register]]
-List connection_info(DbConnection* con) {
-  return con->info();
+cpp11::list connection_info(DbConnection* con) {
+  return (SEXP)con->info();
 }
 
 // Quoting
 
 [[cpp11::register]]
-CharacterVector connection_quote_string(DbConnection* con, CharacterVector xs) {
-  R_xlen_t n = xs.size();
-  CharacterVector output(n);
+cpp11::strings connection_quote_string(DbConnection* con, CharacterVector xs) {
+  const auto n = xs.size();
+  cpp11::writable::strings output(n);
 
   for (R_xlen_t i = 0; i < n; ++i) {
     String x = xs[i];
@@ -68,13 +68,13 @@ CharacterVector connection_quote_string(DbConnection* con, CharacterVector xs) {
 }
 
 [[cpp11::register]]
-CharacterVector connection_quote_identifier(DbConnection* con, CharacterVector xs) {
-  R_xlen_t n = xs.size();
-  CharacterVector output(n);
+cpp11::strings connection_quote_identifier(DbConnection* con, cpp11::strings xs) {
+  const auto n = xs.size();
+  cpp11::writable::strings output(n);
 
   for (R_xlen_t i = 0; i < n; ++i) {
-    String x = xs[i];
-    output[i] = con->quote_identifier(x);
+    const auto x = xs[i];
+    output[i] = con->quote_identifier((SEXP)x);
   }
 
   return output;
@@ -95,8 +95,8 @@ void connection_set_transacting(DbConnection* con, bool transacting) {
 // Specific functions
 
 [[cpp11::register]]
-void connection_copy_data(DbConnection* con, std::string sql, List df) {
-  return con->copy_data(sql, df);
+void connection_copy_data(DbConnection* con, std::string sql, cpp11::list df) {
+  return con->copy_data(sql, (SEXP)df);
 }
 
 [[cpp11::register]]
@@ -106,10 +106,11 @@ List connection_wait_for_notify(DbConnection* con, int timeout_secs) {
 
 // Temporary Schema
 [[cpp11::register]]
-CharacterVector connection_get_temp_schema(DbConnection* con) {
-  return con->get_temp_schema();
+cpp11::strings connection_get_temp_schema(DbConnection* con) {
+  return (SEXP)con->get_temp_schema();
 }
+
 [[cpp11::register]]
-void connection_set_temp_schema(DbConnection* con, CharacterVector temp_schema) {
-  con->set_temp_schema(temp_schema);
+void connection_set_temp_schema(DbConnection* con, cpp11::strings temp_schema) {
+  con->set_temp_schema((SEXP)temp_schema);
 }
diff --git a/src/cpp11.cpp b/src/cpp11.cpp
@@ -38,24 +38,24 @@ extern "C" SEXP _RPostgres_connection_release(SEXP con_) {
   END_CPP11
 }
 // connection.cpp
-List connection_info(DbConnection* con);
+cpp11::list connection_info(DbConnection* con);
 extern "C" SEXP _RPostgres_connection_info(SEXP con) {
   BEGIN_CPP11
     return cpp11::as_sexp(connection_info(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con)));
   END_CPP11
 }
 // connection.cpp
-CharacterVector connection_quote_string(DbConnection* con, CharacterVector xs);
+cpp11::strings connection_quote_string(DbConnection* con, CharacterVector xs);
 extern "C" SEXP _RPostgres_connection_quote_string(SEXP con, SEXP xs) {
   BEGIN_CPP11
     return cpp11::as_sexp(connection_quote_string(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<CharacterVector>>(xs)));
   END_CPP11
 }
 // connection.cpp
-CharacterVector connection_quote_identifier(DbConnection* con, CharacterVector xs);
+cpp11::strings connection_quote_identifier(DbConnection* con, cpp11::strings xs);
 extern "C" SEXP _RPostgres_connection_quote_identifier(SEXP con, SEXP xs) {
   BEGIN_CPP11
-    return cpp11::as_sexp(connection_quote_identifier(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<CharacterVector>>(xs)));
+    return cpp11::as_sexp(connection_quote_identifier(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<cpp11::strings>>(xs)));
   END_CPP11
 }
 // connection.cpp
@@ -74,10 +74,10 @@ extern "C" SEXP _RPostgres_connection_set_transacting(SEXP con, SEXP transacting
   END_CPP11
 }
 // connection.cpp
-void connection_copy_data(DbConnection* con, std::string sql, List df);
+void connection_copy_data(DbConnection* con, std::string sql, cpp11::list df);
 extern "C" SEXP _RPostgres_connection_copy_data(SEXP con, SEXP sql, SEXP df) {
   BEGIN_CPP11
-    connection_copy_data(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<std::string>>(sql), cpp11::as_cpp<cpp11::decay_t<List>>(df));
+    connection_copy_data(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<std::string>>(sql), cpp11::as_cpp<cpp11::decay_t<cpp11::list>>(df));
     return R_NilValue;
   END_CPP11
 }
@@ -89,17 +89,17 @@ extern "C" SEXP _RPostgres_connection_wait_for_notify(SEXP con, SEXP timeout_sec
   END_CPP11
 }
 // connection.cpp
-CharacterVector connection_get_temp_schema(DbConnection* con);
+cpp11::strings connection_get_temp_schema(DbConnection* con);
 extern "C" SEXP _RPostgres_connection_get_temp_schema(SEXP con) {
   BEGIN_CPP11
     return cpp11::as_sexp(connection_get_temp_schema(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con)));
   END_CPP11
 }
 // connection.cpp
-void connection_set_temp_schema(DbConnection* con, CharacterVector temp_schema);
+void connection_set_temp_schema(DbConnection* con, cpp11::strings temp_schema);
 extern "C" SEXP _RPostgres_connection_set_temp_schema(SEXP con, SEXP temp_schema) {
   BEGIN_CPP11
-    connection_set_temp_schema(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<CharacterVector>>(temp_schema));
+    connection_set_temp_schema(cpp11::as_cpp<cpp11::decay_t<DbConnection*>>(con), cpp11::as_cpp<cpp11::decay_t<cpp11::strings>>(temp_schema));
     return R_NilValue;
   END_CPP11
 }