Skip to content

Commit 4a9aae3

Browse files
krlmlrkrlmlr
committed
Sync
1 parent 995a340 commit 4a9aae3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+716
-390
lines changed

Diff for: ‎tests/testthat/test-rel_api.R

+476-238
Large diffs are not rendered by default.

Diff for: ‎tools/tpch-raw-oo/01.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS x <= y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "n"() AS CAST(COUNT(*) AS int32)'))
79
df1 <- lineitem
810
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)

Diff for: ‎tools/tpch-raw-oo/02.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(
79
DBI::dbExecute(
810
con,

Diff for: ‎tools/tpch-raw-oo/03.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
79
invisible(
810
DBI::dbExecute(con, 'CREATE MACRO "___eq_na_matches_na"(x, y) AS (x IS NOT DISTINCT FROM y)')
911
)
1012
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
11-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS x > y'))
13+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS "r_base::>"(x, y)'))
1214
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
1315
df1 <- orders
1416
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)

Diff for: ‎tools/tpch-raw-oo/04.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
911
invisible(DBI::dbExecute(con, 'CREATE MACRO "n"() AS CAST(COUNT(*) AS int32)'))
1012
df1 <- lineitem

Diff for: ‎tools/tpch-raw-oo/05.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
8-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
10+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
911
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
1012
df1 <- nation
1113
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)

Diff for: ‎tools/tpch-raw-oo/06.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS x <= y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
810
df1 <- lineitem
911
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
1012
rel2 <- duckdb$rel_project(

Diff for: ‎tools/tpch-raw-oo/07.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
56
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
7+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
79
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
8-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
9-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS x <= y'))
10+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
11+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
1012
invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
1113
invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
1214
df1 <- supplier

Diff for: ‎tools/tpch-raw-oo/08.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
8-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS x <= y'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
10+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
911
invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
1012
invisible(
1113
DBI::dbExecute(

Diff for: ‎tools/tpch-raw-oo/09.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
56
invisible(
67
DBI::dbExecute(
78
con,
89
'CREATE MACRO "grepl"(pattern, x) AS (CASE WHEN x IS NULL THEN FALSE ELSE regexp_matches(x, pattern) END)'
910
)
1011
)
11-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
12+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
13+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
1214
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
1315
invisible(DBI::dbExecute(con, 'CREATE MACRO "as.integer"(x) AS CAST(x AS int32)'))
1416
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))

Diff for: ‎tools/tpch-raw-oo/10.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
911
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
1012
df1 <- lineitem

Diff for: ‎tools/tpch-raw-oo/11.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS x > y'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS "r_base::>"(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
911
df1 <- nation
1012
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)

Diff for: ‎tools/tpch-raw-oo/12.R

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
56
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
67
invisible(
78
DBI::dbExecute(con, 'CREATE MACRO "___eq_na_matches_na"(x, y) AS (x IS NOT DISTINCT FROM y)')
89
)
9-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
10-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
11-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
10+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
11+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
12+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
13+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
1214
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
1315
invisible(
1416
DBI::dbExecute(
@@ -17,7 +19,7 @@ invisible(
1719
)
1820
)
1921
invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
20-
invisible(DBI::dbExecute(con, 'CREATE MACRO "!="(x, y) AS x <> y'))
22+
invisible(DBI::dbExecute(con, 'CREATE MACRO "!="(x, y) AS "r_base::!="(x, y)'))
2123
df1 <- lineitem
2224
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
2325
rel2 <- duckdb$rel_project(

Diff for: ‎tools/tpch-raw-oo/13.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
56
invisible(DBI::dbExecute(con, 'CREATE MACRO "!"(x) AS (NOT x)'))
67
invisible(
@@ -9,7 +10,8 @@ invisible(
910
'CREATE MACRO "grepl"(pattern, x) AS (CASE WHEN x IS NULL THEN FALSE ELSE regexp_matches(x, pattern) END)'
1011
)
1112
)
12-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
13+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
14+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
1315
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
1416
invisible(
1517
DBI::dbExecute(

Diff for: ‎tools/tpch-raw-oo/14.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
911
invisible(
1012
DBI::dbExecute(

Diff for: ‎tools/tpch-raw-oo/15.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
911
df1 <- lineitem
1012
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)

Diff for: ‎tools/tpch-raw-oo/16.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "!="(x, y) AS x <> y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "!="(x, y) AS "r_base::!="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "!"(x) AS (NOT x)'))
79
invisible(
810
DBI::dbExecute(
@@ -14,7 +16,7 @@ invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
1416
invisible(
1517
DBI::dbExecute(con, 'CREATE MACRO "___eq_na_matches_na"(x, y) AS (x IS NOT DISTINCT FROM y)')
1618
)
17-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
19+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
1820
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
1921
invisible(DBI::dbExecute(con, 'CREATE MACRO "n_distinct"(x) AS (COUNT(DISTINCT x))'))
2022
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))

Diff for: ‎tools/tpch-raw-oo/17.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
810
invisible(
911
DBI::dbExecute(
1012
con,

Diff for: ‎tools/tpch-raw-oo/18.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS x > y'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS "r_base::>"(x, y)'))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
79
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "desc"(x) AS (-x)'))
911
df1 <- lineitem

Diff for: ‎tools/tpch-raw-oo/19.R

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
79
invisible(DBI::dbExecute(con, 'CREATE MACRO "|"(x, y) AS (x OR y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "&"(x, y) AS (x AND y)'))
911
invisible(
1012
DBI::dbExecute(con, 'CREATE MACRO "___eq_na_matches_na"(x, y) AS (x IS NOT DISTINCT FROM y)')
1113
)
12-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
13-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS x <= y'))
14+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
15+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<="(x, y) AS "r_base::<="(x, y)'))
1416
df1 <- lineitem
1517
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
1618
rel2 <- duckdb$rel_set_alias(rel1, "lhs")

Diff for: ‎tools/tpch-raw-oo/20.R

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
5-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
6+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
7+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
68
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
79
invisible(
810
DBI::dbExecute(
911
con,
1012
'CREATE MACRO "grepl"(pattern, x) AS (CASE WHEN x IS NULL THEN FALSE ELSE regexp_matches(x, pattern) END)'
1113
)
1214
)
13-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS x >= y'))
14-
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS x < y'))
15-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS x > y'))
15+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">="(x, y) AS "r_base::>="(x, y)'))
16+
invisible(DBI::dbExecute(con, 'CREATE MACRO "<"(x, y) AS "r_base::<"(x, y)'))
17+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS "r_base::>"(x, y)'))
1618
df1 <- nation
1719
rel1 <- duckdb$rel_from_df(con, df1, experimental = experimental)
1820
rel2 <- duckdb$rel_project(

Diff for: ‎tools/tpch-raw-oo/21.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qloadm("tools/tpch/001.qs")
22
duckdb <- asNamespace("duckdb")
3-
con <- DBI::dbConnect(duckdb::duckdb())
3+
drv <- duckdb::duckdb()
4+
con <- DBI::dbConnect(drv)
45
experimental <- FALSE
56
invisible(DBI::dbExecute(con, 'CREATE MACRO "n"() AS CAST(COUNT(*) AS int32)'))
6-
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS x > y'))
7-
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS x = y'))
7+
invisible(duckdb$rapi_load_rfuns(drv@database_ref))
8+
invisible(DBI::dbExecute(con, 'CREATE MACRO ">"(x, y) AS "r_base::>"(x, y)'))
9+
invisible(DBI::dbExecute(con, 'CREATE MACRO "=="(x, y) AS "r_base::=="(x, y)'))
810
invisible(DBI::dbExecute(con, 'CREATE MACRO "___coalesce"(x, y) AS COALESCE(x, y)'))
911
invisible(DBI::dbExecute(con, 'CREATE MACRO "any"(x) AS (bool_or(x))'))
1012
invisible(

0 commit comments

Comments
 (0)