Merge pull request #2148 from cynkra/b-dbi

cynkra · Dec 21, 2023 · 3c8d712 · 3c8d712
2 parents 16549e1 + 973f093
commit 3c8d712
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/R/build_copy_queries.R b/R/build_copy_queries.R
@@ -203,7 +203,7 @@ build_copy_queries <- function(dest, dm, set_key_constraints = TRUE, temporary =
           name = child_table,
           index_name = map_chr(child_fk_cols, paste, collapse = "_"),
           remote_name = purrr::map_chr(table_names[name], ~ DBI::dbQuoteIdentifier(con, .x)),
-          remote_name_unquoted = map_chr(DBI::dbUnquoteIdentifier(con, DBI::SQL(remote_name)), ~ .x@name[["table"]]),
+          remote_name_unquoted = map_chr(DBI::dbUnquoteIdentifier(con, DBI::SQL(remote_name)), ~ .x@name[[length(.x@name)]]),
           index_name = make.unique(paste0(remote_name_unquoted, "__", index_name), sep = "__")
         ) %>%
         group_by(name) %>%

diff --git a/R/dm_from_con.R b/R/dm_from_con.R
@@ -107,12 +107,13 @@ dm_from_con <- function(
     src_tbl_names <- get_src_tbl_names(src, ..., names = .names)
   } else {
     src_tbl_names <- table_names
+    if (is.null(names(src_tbl_names))) {
+      names(src_tbl_names) <- src_tbl_names
+    }
   }
 
-  nms <- purrr::map_chr(src_tbl_names, ~ .x@name[["table"]])
-
   tbls <-
-    set_names(src_tbl_names, nms) %>%
+    src_tbl_names %>%
     quote_ids(con) %>%
     map(possibly(tbl, NULL), src = src)
 

diff --git a/R/dm_sql.R b/R/dm_sql.R
@@ -543,7 +543,7 @@ ddl_get_index_defs <- function(fks, con, table_names) {
       name = child_table,
       index_name = map_chr(child_fk_cols, paste, collapse = "_"),
       remote_name = table_names[name],
-      remote_name_unquoted = map_chr(DBI::dbUnquoteIdentifier(con, DBI::SQL(remote_name)), ~ .x@name[["table"]]),
+      remote_name_unquoted = map_chr(DBI::dbUnquoteIdentifier(con, DBI::SQL(remote_name)), ~ .x@name[[length(.x@name)]]),
       index_name = make.unique(paste0(remote_name_unquoted, "__", index_name), sep = "__")
     ) %>%
     group_by(name) %>%

diff --git a/tests/testthat/test-learn.R b/tests/testthat/test-learn.R
@@ -22,7 +22,7 @@ test_that("Standard learning from MSSQL (schema 'dbo') or Postgres (schema 'publ
     ) %>%
     DBI::SQL() %>%
     DBI::dbUnquoteIdentifier(conn = con_db) %>%
-    map_chr(~ .x@name[["table"]])
+    map_chr(~ .x@name[[length(.x@name)]])
 
   remote_tbl_map <- set_names(remote_tbl_names, gsub("^(tf_.).*$", "\\1", remote_tbl_names))
 

diff --git a/tests/testthat/test_dm_from_con.R b/tests/testthat/test_dm_from_con.R
@@ -24,7 +24,7 @@ test_that("table identifiers are quoted", {
     suppress_mssql_warning(dm_from_con(con_db, learn_keys = FALSE)) %>%
     dm_select_tbl(!!!map(
       DBI::dbUnquoteIdentifier(con_db, DBI::SQL(remote_tbl_names_copied)),
-      ~ .x@name[["table"]]
+      ~ .x@name[[length(.x@name)]]
     ))
 
   remote_tbl_names_learned <-