test: Update duckplyr tests

duckdb · Nov 14, 2023 · 090fa72 · 090fa72
1 parent d8c4235
commit 090fa72
Showing 1 changed file with 15 additions and 70 deletions.
diff --git a/tests/testthat/test-rel_api.R b/tests/testthat/test-rel_api.R
@@ -7,10 +7,7 @@ test_that("relational anti_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -80,10 +77,7 @@ test_that("relational anti_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -1389,8 +1383,6 @@ test_that("relational distinct(g) order-preserving", {
 })
 
 test_that("relational union_all(data.frame(a = 1L, b = 3, g = 2L)) %>% distinct(g) order-preserving", {
-  skip_if_not_installed("duckdb", "0.8.1-9000")
-
   # Autogenerated
   con <- dbConnect(duckdb())
   experimental <- FALSE
@@ -1584,8 +1576,6 @@ test_that("relational union_all(data.frame(a = 1L, b = 3, g = 2L)) %>% distinct(
 })
 
 test_that("relational union_all(data.frame(a = 1L, b = 4, g = 2L)) %>% distinct(g) order-preserving", {
-  skip_if_not_installed("duckdb", "0.8.1-9000")
-
   # Autogenerated
   con <- dbConnect(duckdb())
   experimental <- FALSE
@@ -1779,8 +1769,6 @@ test_that("relational union_all(data.frame(a = 1L, b = 4, g = 2L)) %>% distinct(
 })
 
 test_that("relational union_all(data.frame(a = 1L, b = 5, g = 2L)) %>% distinct(g) order-preserving", {
-  skip_if_not_installed("duckdb", "0.8.1-9000")
-
   # Autogenerated
   con <- dbConnect(duckdb())
   experimental <- FALSE
@@ -1974,8 +1962,6 @@ test_that("relational union_all(data.frame(a = 1L, b = 5, g = 2L)) %>% distinct(
 })
 
 test_that("relational union_all(data.frame(a = 1L, b = 6, g = 2L)) %>% distinct(g) order-preserving", {
-  skip_if_not_installed("duckdb", "0.8.1-9000")
-
   # Autogenerated
   con <- dbConnect(duckdb())
   experimental <- FALSE
@@ -2169,8 +2155,6 @@ test_that("relational union_all(data.frame(a = 1L, b = 6, g = 2L)) %>% distinct(
 })
 
 test_that("relational union_all(data.frame(a = 1L, b = 7, g = 2L)) %>% distinct(g) order-preserving", {
-  skip_if_not_installed("duckdb", "0.8.1-9000")
-
   # Autogenerated
   con <- dbConnect(duckdb())
   experimental <- FALSE
@@ -3246,10 +3230,7 @@ test_that("relational full_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -3378,10 +3359,7 @@ test_that("relational full_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -3470,10 +3448,7 @@ test_that("relational inner_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -3602,10 +3577,7 @@ test_that("relational inner_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -3694,10 +3666,7 @@ test_that("relational intersect() order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"==\"(x, y) AS x = y"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -3882,10 +3851,7 @@ test_that("relational left_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -4014,10 +3980,7 @@ test_that("relational left_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"___coalesce\"(x, y) AS COALESCE(x, y)"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -9952,10 +9915,7 @@ test_that("relational right_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -10083,10 +10043,7 @@ test_that("relational right_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -10370,10 +10327,7 @@ test_that("relational semi_join(join_by(a)) order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -10443,10 +10397,7 @@ test_that("relational semi_join(join_by(a)) order-enforcing", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
 
@@ -10481,10 +10432,7 @@ test_that("relational setdiff() order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"==\"(x, y) AS x = y"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))
@@ -11106,10 +11054,7 @@ test_that("relational symdiff() order-preserving", {
   con <- dbConnect(duckdb())
   experimental <- FALSE
   invisible(
-    dbExecute(
-      con,
-      "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS ((x IS NULL AND y IS NULL) OR (x = y))"
-    )
+    dbExecute(con, "CREATE MACRO \"___eq_na_matches_na\"(x, y) AS (x IS NOT DISTINCT FROM y)")
   )
   invisible(dbExecute(con, "CREATE MACRO \"==\"(x, y) AS x = y"))
   df1 <- data.frame(a = 1:4, b = rep(2, 4L))