Merge pull request #351 from r-dbi/f-rsqlite

chore: Align with RSQLite
r-dbi · Jan 11, 2024 · 56a9c45 · 56a9c45
2 parents 6900945 + 8546ec2
commit 56a9c45
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -44,6 +44,8 @@ Suggests:
     RSQLite
 VignetteBuilder: 
     knitr
+Remotes: 
+    r-dbi/RSQLite
 Config/autostyle/scope: line_breaks
 Config/autostyle/strict: false
 Config/testthat/edition: 3

diff --git a/tests/testthat/helper-dev.R b/tests/testthat/helper-dev.R
@@ -1,7 +1,8 @@
 if (Sys.getenv("CI") == "" && dir.exists("../../../RSQLite")) {
   writeLines(
     c(
-      "# Generated by helper-dev.R, do not edit by hand",
+      # Avoid warning
+      paste0("# Generated by helper-dev.R, do not edit", " by hand"),
       "",
       "skip_if_not_installed(\"RSQLite\")",
       "skip_if_not_installed(\"nanoarrow\")",

diff --git a/tests/testthat/test-DBItest.R b/tests/testthat/test-DBItest.R
@@ -13,7 +13,7 @@ tryCatch(skip = function(e) message(conditionMessage(e)), {
     RSQLite::SQLite(),
     list(dbname = tempfile("DBItest", fileext = ".sqlite")),
     tweaks = DBItest::tweaks(
-      dbitest_version = "1.7.2",
+      dbitest_version = "1.8.0",
       constructor_relax_args = TRUE,
       placeholder_pattern = c("?", "$1", "$name", ":name"),
       date_cast = function(x) paste0("'", x, "'"),
@@ -33,7 +33,11 @@ tryCatch(skip = function(e) message(conditionMessage(e)), {
 skip_on_cran()
 skip_if_not_installed("DBItest")
 
-DBItest::test_all()
+DBItest::test_all(
+  skip = c(
+    if (getRversion() < "4.0") "stream_bind_too_many"
+  )
+)
 
 # Cleanup
 set_default_context(NULL)