Tests

duckdblabs · May 5, 2024 · 6d093e4 · 6d093e4
1 parent cf7296f
commit 6d093e4
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 26 deletions.
diff --git a/R/tpch_raw_07.R b/R/tpch_raw_07.R
@@ -686,7 +686,7 @@ tpch_raw_07 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/R/tpch_raw_08.R b/R/tpch_raw_08.R
@@ -686,7 +686,7 @@ tpch_raw_08 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/R/tpch_raw_09.R b/R/tpch_raw_09.R
@@ -555,7 +555,7 @@ tpch_raw_09 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/R/tpch_raw_oo_07.R b/R/tpch_raw_oo_07.R
@@ -1150,7 +1150,7 @@ tpch_raw_oo_07 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/R/tpch_raw_oo_08.R b/R/tpch_raw_oo_08.R
@@ -1147,7 +1147,7 @@ tpch_raw_oo_08 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/R/tpch_raw_oo_09.R b/R/tpch_raw_oo_09.R
@@ -866,7 +866,7 @@ tpch_raw_oo_09 <- function(con, experimental) {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_function(
               "strftime",

diff --git a/tests/testthat/test-rel_api.R b/tests/testthat/test-rel_api.R
@@ -8990,7 +8990,7 @@ test_that("relational mutate(d = row_number()) order-preserving", {
   drv <- duckdb::duckdb()
   con <- DBI::dbConnect(drv)
   experimental <- FALSE
-  invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
+  invisible(duckdb$rapi_load_rfuns(drv@database_ref))
   df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))
 
   rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -9014,7 +9014,7 @@ test_that("relational mutate(d = row_number()) order-preserving", {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_window(duckdb$expr_function("row_number", list()), list(), list(), offset_expr = NULL, default_expr = NULL)
           )
@@ -9039,7 +9039,7 @@ test_that("relational mutate(d = row_number(), .by = g) order-preserving", {
   drv <- duckdb::duckdb()
   con <- DBI::dbConnect(drv)
   experimental <- FALSE
-  invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
+  invisible(duckdb$rapi_load_rfuns(drv@database_ref))
   df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))
 
   rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -9093,7 +9093,7 @@ test_that("relational mutate(d = row_number(), .by = g) order-preserving", {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_window(duckdb$expr_function("row_number", list()), list(duckdb$expr_reference("g")), list(), offset_expr = NULL, default_expr = NULL)
           )
@@ -12941,7 +12941,7 @@ test_that("relational mutate(d = row_number()) order-enforcing", {
   drv <- duckdb::duckdb()
   con <- DBI::dbConnect(drv)
   experimental <- FALSE
-  invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
+  invisible(duckdb$rapi_load_rfuns(drv@database_ref))
   df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))
 
   rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -12965,7 +12965,7 @@ test_that("relational mutate(d = row_number()) order-enforcing", {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_window(duckdb$expr_function("row_number", list()), list(), list(), offset_expr = NULL, default_expr = NULL)
           )
@@ -12994,7 +12994,7 @@ test_that("relational mutate(d = row_number(), .by = g) order-enforcing", {
   drv <- duckdb::duckdb()
   con <- DBI::dbConnect(drv)
   experimental <- FALSE
-  invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
+  invisible(duckdb$rapi_load_rfuns(drv@database_ref))
   df1 <- data.frame(a = seq(1, 6, by = 1), b = rep(2, 6L), g = c(1L, 2L, 2L, 3L, 3L, 3L))
 
   rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -13018,7 +13018,7 @@ test_that("relational mutate(d = row_number(), .by = g) order-enforcing", {
       },
       {
         tmp_expr <- duckdb$expr_function(
-          "as.integer",
+          "r_base::as.integer",
           list(
             duckdb$expr_window(duckdb$expr_function("row_number", list()), list(duckdb$expr_reference("g")), list(), offset_expr = NULL, default_expr = NULL)
           )

diff --git a/tools/tpch-raw-oo/07.R b/tools/tpch-raw-oo/07.R
@@ -10,7 +10,6 @@ invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y
 invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 df1 <- supplier
 rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
 rel2 <- duckdb$rel_project(
@@ -1161,7 +1160,7 @@ rel70 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",

diff --git a/tools/tpch-raw-oo/08.R b/tools/tpch-raw-oo/08.R
@@ -8,7 +8,6 @@ invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 invisible(
   DBI::dbExecute(
     con,
@@ -1168,7 +1167,7 @@ rel87 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",

diff --git a/tools/tpch-raw-oo/09.R b/tools/tpch-raw-oo/09.R
@@ -12,7 +12,6 @@ invisible(
 invisible(duckdb$rapi_load_rfuns(drv@database_ref))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
 df1 <- part
 rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -880,7 +879,7 @@ rel57 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",

diff --git a/tools/tpch-raw/07.R b/tools/tpch-raw/07.R
@@ -10,7 +10,6 @@ invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y
 invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 df1 <- supplier
 rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
 rel2 <- duckdb$rel_project(
@@ -697,7 +696,7 @@ rel43 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",

diff --git a/tools/tpch-raw/08.R b/tools/tpch-raw/08.R
@@ -8,7 +8,6 @@ invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 invisible(
   DBI::dbExecute(
     con,
@@ -707,7 +706,7 @@ rel57 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",

diff --git a/tools/tpch-raw/09.R b/tools/tpch-raw/09.R
@@ -12,7 +12,6 @@ invisible(
 invisible(duckdb$rapi_load_rfuns(drv@database_ref))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
-invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
 invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
 df1 <- part
 rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
@@ -569,7 +568,7 @@ rel39 <- duckdb$rel_project(
     },
     {
       tmp_expr <- duckdb$expr_function(
-        "as.integer",
+        "r_base::as.integer",
         list(
           duckdb$expr_function(
             "strftime",