bind_values_expr constructive

r-dbi · Dec 17, 2023 · 0d818d0 · 0d818d0
1 parent 7673e43
commit 0d818d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,6 +18,7 @@ Depends:
 Imports: 
     blob (>= 1.2.0),
     callr,
+    constructive,
     DBI (>= 1.1.3.9004),
     desc,
     hms (>= 0.5.0),

diff --git a/R/spec-meta-bind-runner.R b/R/spec-meta-bind-runner.R
@@ -43,7 +43,7 @@ run_bind_tester$fun <- function(
   force(is_untouched)
 
   bind_values_expr <- rlang::expr({
-    bind_values <- !!bind_values
+    bind_values <- !!construct_expr(bind_values)
   })
 
   skip_expr <- if (!is.null(skip_fun) && skip_fun()) rlang::expr({
@@ -222,3 +222,8 @@ run_bind_tester$fun <- function(
   rm(bind_values)
   rlang::eval_bare(test_expr)
 }
+
+construct_expr <- function(x) {
+  xc <- constructive::construct(x)
+  rlang::parse_expr(format(xc$code))
+}
diff --git a/R/spec-meta-bind.R b/R/spec-meta-bind.R
@@ -306,9 +306,13 @@ spec_meta_bind <- list(
     test_select_bind(con, ctx, c(get_texts(), NA))
   },
 
-  bind_character_escape = function(ctx, con) {
+  bind_character_escape = if (getRversion() >= "4.0") function(ctx, con) {
     #'   (also with special characters such as spaces, newlines, quotes, and backslashes)
-    test_select_bind(con, ctx, c(" ", "\n", "\r", "\b", "'", '"', "[", "]", "\\", NA))
+    test_select_bind(
+      con,
+      ctx,
+      c(" ", "\n", "\r", "\b", "'", '"', "[", "]", "\\", NA)
+    )
   },
 
   bind_factor = function(ctx, con) {