Skip to content

Commit a10ff78

Browse files
krlmlrkrlmlr
committed
new_dm3 -> dm_from_def
1 parent 6839b6e commit a10ff78

34 files changed

+93
-93
lines changed

‎R/add-tbl.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dm_add_tbl_impl <- function(dm, tbls, table_name, filters = list_of(new_filter()
3030
def_0$fks <- fks
3131
def_0$filters <- filters
3232

33-
new_dm3(vec_rbind(def, def_0))
33+
dm_from_def(vec_rbind(def, def_0))
3434
}
3535

3636
check_new_tbls <- function(dm, tbls) {
@@ -80,5 +80,5 @@ dm_mutate_tbl <- function(dm, ...) {
8080

8181
def <- dm_get_def(dm)
8282
def$data <- unname(old_tables)
83-
new_dm3(def)
83+
dm_from_def(def)
8484
}

‎R/bind.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bind_rename_tbl <- function(dm, renamed) {
4444
def %>%
4545
bind_filter_recode_table_def(renamed) %>%
4646
filter_recode_table_fks(renamed_names) %>%
47-
new_dm3()
47+
dm_from_def()
4848
}
4949

5050
bind_filter_recode_table_def <- function(def, renamed) {

‎R/db-interface.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ copy_dm_to <- function(dest, dm, ...,
251251
# remote dm is same as source dm with replaced data
252252
def <- dm_get_def(dm)
253253
def$data <- unname(remote_tables[names(dm)])
254-
remote_dm <- new_dm3(def)
254+
remote_dm <- dm_from_def(def)
255255

256256
invisible(debug_dm_validate(remote_dm))
257257
}

‎R/descriptions.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dm_set_table_description <- function(dm, ...) {
5353
labels <- names(selected)
5454

5555
out <- dm_set_table_description_impl(def, selected, labels)
56-
new_dm3(out)
56+
dm_from_def(out)
5757
}
5858

5959
dm_set_table_description_impl <- function(def, selected, labels) {
@@ -124,5 +124,5 @@ dm_reset_table_description <- function(dm, table = NULL, ...) {
124124
labels <- rep(list(NULL), length(tables))
125125

126126
out <- dm_set_table_description_impl(def, tables, labels)
127-
new_dm3(out)
127+
dm_from_def(out)
128128
}

‎R/disentangle.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ dm_disentangle <- function(dm, start, quiet = FALSE) {
3333
select(-fks) %>%
3434
relocate(fks = new_fks, .after = uks) %>%
3535
mutate(fks = vctrs::as_list_of(map(fks, ~ .x %||% new_fk()))) %>%
36-
new_dm3()
36+
dm_from_def()
3737
}

‎R/dm.R

+7-7
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dm <- function(...,
8181
dm_tbl <- dm_impl(dots[!is_dm], names(quos_auto_name(quos[!is_dm])))
8282
def <- dm_bind_impl(c(dots[is_dm], list(dm_tbl)), .name_repair, .quiet, repair_arg = "")
8383

84-
dm <- new_dm3(def)
84+
dm <- dm_from_def(def)
8585
dm_validate(dm)
8686
dm
8787
}
@@ -126,7 +126,7 @@ dm_impl <- function(tbls, names) {
126126
#' @export
127127
new_dm <- function(tables = list()) {
128128
def <- new_keyed_dm_def(tables)
129-
new_dm3(def)
129+
dm_from_def(def)
130130
}
131131

132132
new_keyed_dm_def <- function(tables = list()) {
@@ -182,7 +182,7 @@ new_dm_def <- function(tables = list(),
182182
def
183183
}
184184

185-
new_dm3 <- function(def, zoomed = FALSE, validate = TRUE) {
185+
dm_from_def <- function(def, zoomed = FALSE, validate = TRUE) {
186186
if (is.null(def[["uuid"]])) {
187187
def$uuid <- vec_new_uuid_along(def$table)
188188
} else {
@@ -697,7 +697,7 @@ compute.dm <- function(x, ...) {
697697
dm_apply_filters_impl() %>%
698698
dm_get_def() %>%
699699
mutate(data = map(data, compute, ...)) %>%
700-
new_dm3()
700+
dm_from_def()
701701
}
702702

703703
#' Materialize
@@ -716,7 +716,7 @@ collect.dm <- function(x, ..., progress = NA) {
716716

717717
ticker <- new_ticker("downloading data", nrow(def), progress = progress)
718718
def$data <- map(def$data, ticker(collect), ...)
719-
new_dm3(def, zoomed = is_zoomed(x))
719+
dm_from_def(def, zoomed = is_zoomed(x))
720720
}
721721

722722
#' @export
@@ -758,7 +758,7 @@ tbl_vars.dm_zoomed <- function(x) {
758758
dm_reset_all_filters <- function(dm) {
759759
def <- dm_get_def(dm)
760760
def$filters <- list_of(new_filter())
761-
new_dm3(def)
761+
dm_from_def(def)
762762
}
763763

764764
all_same_source <- function(tables) {
@@ -769,7 +769,7 @@ all_same_source <- function(tables) {
769769

770770
# creates an empty `dm`-object, `src` is defined by implementation of `dm_get_src_impl()`.
771771
empty_dm <- function() {
772-
new_dm3(
772+
dm_from_def(
773773
tibble(
774774
table = character(),
775775
data = list(),

‎R/dm_nest_tbl.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dm_nest_tbl <- function(dm, child_table, into = NULL) {
9090
def[def$table == parent_name, ][["fks"]][[1]] <- new_parent_table_fk
9191
def <- def[def$table != table_name, ]
9292

93-
new_dm3(def)
93+
dm_from_def(def)
9494
}
9595

9696
#' dm_pack_tbl()
@@ -157,7 +157,7 @@ dm_pack_tbl <- function(dm, parent_table, into = NULL) {
157157
def$data[def$table == child_name] <- list(packed_data)
158158
def <- def[def$table != table_name, ]
159159

160-
new_dm3(def)
160+
dm_from_def(def)
161161
}
162162

163163
check_table_can_be_packed <- function(table_name, children_names, fks) {

‎R/draw-dm.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ dm_set_colors <- function(dm, ...) {
283283
mutate(display = coalesce(new_display, display)) %>%
284284
select(-new_display)
285285

286-
new_dm3(def)
286+
dm_from_def(def)
287287
}
288288

289289
color_quos_to_display <- function(...) {

‎R/filter-dm.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ set_filter_for_table <- function(dm, table, filter_exprs, zoomed) {
150150

151151
i <- which(def$table == table)
152152
def$filters[[i]] <- vec_rbind(def$filters[[i]], new_filter(filter_exprs, zoomed))
153-
new_dm3(def, zoomed = zoomed)
153+
dm_from_def(def, zoomed = zoomed)
154154
}
155155

156156

@@ -174,7 +174,7 @@ dm_apply_filters_impl <- function(dm) {
174174

175175
def$data <- map(def$table, ~ dm_get_filtered_table(dm, .))
176176

177-
dm_reset_all_filters(new_dm3(def))
177+
dm_reset_all_filters(dm_from_def(def))
178178
}
179179

180180
#' @rdname deprecated

‎R/filter-helpers.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ repair_by <- function(by) {
4949
update_filter <- function(dm, table_name, filters) {
5050
def <- dm_get_def(dm)
5151
def$filters[def$table == table_name] <- filters
52-
new_dm3(def, zoomed = TRUE)
52+
dm_from_def(def, zoomed = TRUE)
5353
}

‎R/flatten.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,5 @@ prepare_dm_for_flatten <- function(dm, tables, gotta_rename, position = "suffix"
266266

267267
def <- dm_get_def(clean_dm)
268268
def$data[[which(def$table == start)]] <- start_tbl
269-
new_dm3(def)
269+
dm_from_def(def)
270270
}

‎R/foreign-keys.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ dm_add_fk_impl <- function(dm, table, column, ref_table, ref_column, on_delete)
157157
new_fk(ref_column, table, column, on_delete)
158158
)
159159

160-
new_dm3(def)
160+
dm_from_def(def)
161161
}
162162

163163
#' Check if foreign keys exists
@@ -433,7 +433,7 @@ dm_rm_fk_impl <- function(dm, table_name, cols, ref_table_name, ref_cols) {
433433
# Execute
434434
def$fks[idx] <- map2(def$fks[idx], idx_fk, ~ .x[-.y, ])
435435

436-
new_dm3(def)
436+
dm_from_def(def)
437437
}
438438

439439
#' Foreign key candidates

‎R/learn.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ dm_learn_from_db <- function(dest, dbname = NA, schema = NULL, name_format = "{t
184184

185185
# FIXME: add uks_df
186186
def <- new_dm_def(tables, pks_df, fks_df = fks_df)
187-
new_dm3(def)
187+
dm_from_def(def)
188188
}
189189

190190
schema_if <- function(schema, table, con, dbname = NULL) {

‎R/primary-keys.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dm_add_pk_impl <- function(dm, table, column, autoincrement, force) {
100100

101101
def$pks[[i]] <- new_pk(column = list(column), autoincrement = autoincrement)
102102

103-
new_dm3(def)
103+
dm_from_def(def)
104104
}
105105

106106
#' Check for primary key
@@ -311,7 +311,7 @@ dm_rm_pk_impl <- function(dm, table_name, columns) {
311311
# Execute
312312
def$pks[i] <- list_of(new_pk())
313313

314-
new_dm3(def)
314+
dm_from_def(def)
315315
}
316316

317317

‎R/ptype.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ dm_ptype <- function(dm) {
2626
dm %>%
2727
dm_get_def() %>%
2828
mutate(data = map(data, ~ head(.x, 0))) %>%
29-
new_dm3() %>%
29+
dm_from_def() %>%
3030
collect()
3131
}

‎R/rows-dm.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ dm_patch_tbl <- function(dm, ...) {
439439
def <- dm_get_def(dm)
440440
idx <- match(names(new_tables), def$table)
441441
def[idx, "data"] <- list(unname(new_tables))
442-
new_dm3(def)
442+
dm_from_def(def)
443443
}
444444

445445
get_autoinc_col <- function(x, table, cols) {

‎R/select-tbl.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dm_select_tbl_impl <- function(dm, selected) {
5555
filter_recode_table_def(selected) %>%
5656
filter_recode_table_fks(selected)
5757

58-
new_dm3(def)
58+
dm_from_def(def)
5959
}
6060

6161
filter_recode_table_fks <- function(def, selected) {

‎R/unique-keys.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ dm_add_uk_impl <- function(dm, table, column) {
8282
new_uk(list(column))
8383
)
8484

85-
new_dm3(def)
85+
dm_from_def(def)
8686
}
8787

8888
#' Get all unique keys of a [`dm`] object
@@ -262,7 +262,7 @@ dm_rm_uk_impl <- function(dm, table_name, columns) {
262262
list_of(filter(def$uks[[i]], !ii))
263263
}
264264

265-
new_dm3(def)
265+
dm_from_def(def)
266266
}
267267

268268
# Error -------------------------------------------------------------------

‎R/upgrade.R

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dm_upgrade <- function(dm, quiet) {
1515
.x <- .x[c("ref_column", "table", "column")]
1616
.x
1717
}))
18-
dm <- new_dm3(def, zoomed = is_zoomed(dm), validate = FALSE)
18+
dm <- dm_from_def(def, zoomed = is_zoomed(dm), validate = FALSE)
1919
}
2020

2121
if (version < 2L) {
@@ -26,7 +26,7 @@ dm_upgrade <- function(dm, quiet) {
2626
}
2727
def <- unclass(dm)$def
2828
def$fks <- list_of(!!!map(def$fks, mutate, on_delete = "no_action"))
29-
dm <- new_dm3(def, zoomed = is_zoomed(dm), validate = FALSE)
29+
dm <- dm_from_def(def, zoomed = is_zoomed(dm), validate = FALSE)
3030
}
3131

3232
if (version < 3L) {
@@ -37,7 +37,7 @@ dm_upgrade <- function(dm, quiet) {
3737
}
3838
def <- unclass(dm)$def
3939
def$uuid <- vec_new_uuid_along(def$table)
40-
dm <- new_dm3(def, zoomed = is_zoomed(dm), validate = FALSE)
40+
dm <- dm_from_def(def, zoomed = is_zoomed(dm), validate = FALSE)
4141
}
4242

4343
if (version < 4L) {
@@ -48,7 +48,7 @@ dm_upgrade <- function(dm, quiet) {
4848
def$pks <- map(def$pks, mutate, autoincrement = FALSE) %>%
4949
vctrs::as_list_of(new_pk())
5050
def <- mutate(def, uks = vctrs::list_of(new_uk()), .after = pks)
51-
dm <- new_dm3(def, zoomed = is_zoomed(dm))
51+
dm <- dm_from_def(def, zoomed = is_zoomed(dm))
5252
}
5353

5454
dm

‎R/zoom.R

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ dm_zoom_to <- function(dm, table) {
8686
def$zoom[[where]] <- zoomed_tbl
8787
def$col_tracker_zoom[[where]] <- set_names(colnames(zoomed_tbl))
8888

89-
new_dm3(def, zoomed = TRUE)
89+
dm_from_def(def, zoomed = TRUE)
9090
}
9191

9292
is_zoomed <- function(dm) {
@@ -204,7 +204,7 @@ dm_update_zoomed <- function(dm) {
204204

205205
new_def %>%
206206
clean_zoom() %>%
207-
new_dm3()
207+
dm_from_def()
208208
}
209209

210210
#' @rdname dm_zoom_to
@@ -227,14 +227,14 @@ dm_discard_zoomed <- function(dm) {
227227

228228
def %>%
229229
clean_zoom() %>%
230-
new_dm3()
230+
dm_from_def()
231231
}
232232

233233
dm_clean_zoomed <- function(dm) {
234234
dm %>%
235235
dm_get_def() %>%
236236
clean_zoom() %>%
237-
new_dm3()
237+
dm_from_def()
238238
}
239239

240240
clean_zoom <- function(def) {
@@ -355,7 +355,7 @@ replace_zoomed_tbl <- function(dm, new_zoomed_tbl, tracked_cols = NULL) {
355355
if (!is_null(tracked_cols)) {
356356
def$col_tracker_zoom[[where]] <- tracked_cols
357357
}
358-
new_dm3(def, zoomed = TRUE)
358+
dm_from_def(def, zoomed = TRUE)
359359
}
360360

361361
check_zoomed <- function(dm) {

0 commit comments

Comments
 (0)