Merge remote-tracking branch 'upstream/main'

ropensci · Apr 8, 2024 · c52f0e9 · c52f0e9
2 parents c54db3f + d2aa156
commit c52f0e9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,5 @@
 # dittodb (development version)
+* Added to the `dbplyr` unique table names that are ignored to work with the newest `dbplyr` table names. (#188)
 
 # dittodb 0.1.7
 * Added better capture support for unknown databases including better capture support for Teradata databases. (#176, @sandstumpen)

diff --git a/R/utils.R b/R/utils.R
@@ -111,7 +111,7 @@ ignore_dbplyr_unique_names <- function(statement) {
     statement
   )
   statement <- gsub(
-    "`dbplyr_[[:digit:]]+`",
+    "`dbplyr_[[:alnum:]]+`",
     "`removed_unique_dplyr_name`",
     statement
   )

diff --git a/codemeta.json b/codemeta.json
@@ -14,7 +14,7 @@
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.3.2 (2023-10-31)",
+  "runtimePlatform": "R version 4.3.3 (2024-02-29)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -319,7 +319,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "638.617KB",
+  "fileSize": "638.87KB",
   "releaseNotes": "https://github.com/ropensci/dittodb/blob/main/NEWS.md",
   "readme": "https://github.com/ropensci/dittodb/blob/main/README.md",
   "contIntegration": ["https://github.com/ropensci/dittodb/actions?workflow=check-macOS", "https://github.com/ropensci/dittodb/actions?workflow=check-linux", "https://github.com/ropensci/dittodb/actions?workflow=check-windows", "https://app.codecov.io/gh/ropensci/dittodb?branch=main"],

diff --git a/db-setup/local-mariadb-docker-setup.sh b/db-setup/local-mariadb-docker-setup.sh
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -44,6 +44,7 @@ test_that("we can remove the unique dbplyr names", {
   with_unique <- "SELECT *\nFROM `airlines` AS `zzz26`"
   with_dbplyr <- "SELECT *\nFROM `airlines` AS `dbplyr_009`"
   with_dbplyr2 <- "SELECT *\nFROM `airlines` AS `q01`"
+  with_dbplyr3 <- "SELECT *\nFROM `airlines` AS `dbplyr_K614OHb94V`"
   no_unique <- "SELECT *\nFROM `airlines` AS `my_special_airlines_table`"
   with_quotes <- "SELECT *\nFROM \"airlines\" AS \"zzz16\""
   with_unique_long <- "SELECT *\nFROM `airlines` AS `zzz26666`"
@@ -54,6 +55,7 @@ test_that("we can remove the unique dbplyr names", {
   expect_identical(ignore_dbplyr_unique_names(with_unique), expected)
   expect_identical(ignore_dbplyr_unique_names(with_dbplyr), expected)
   expect_identical(ignore_dbplyr_unique_names(with_dbplyr2), expected)
+  expect_identical(ignore_dbplyr_unique_names(with_dbplyr3), expected)
   expect_identical(ignore_dbplyr_unique_names(no_unique), no_unique)
   expect_identical(ignore_dbplyr_unique_names(with_unique_long), expected)
   expect_identical(