Merge pull request #462 from r-dbi/f-list-fields

chore: Refactor `list_fields()`
r-dbi · Apr 1, 2024 · 3957ee6 · 3957ee6
2 parents e93306e + 1894174
commit 3957ee6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/R/dbListFields_PqConnection_Id.R b/R/dbListFields_PqConnection_Id.R
@@ -1,7 +1,7 @@
 #' @rdname postgres-tables
 #' @usage NULL
 dbListFields_PqConnection_Id <- function(conn, name, ...) {
-  list_fields(conn, name@name)
+  list_fields(conn, name)
 }
 
 #' @rdname postgres-tables

diff --git a/R/dbListFields_PqConnection_character.R b/R/dbListFields_PqConnection_character.R
@@ -2,7 +2,7 @@
 #' @usage NULL
 dbListFields_PqConnection_character <- function(conn, name, ...) {
   quoted <- dbQuoteIdentifier(conn, name)
-  id <- dbUnquoteIdentifier(conn, quoted)[[1]]@name
+  id <- dbUnquoteIdentifier(conn, quoted)[[1]]
 
   list_fields(conn, id)
 }

diff --git a/R/tables.R b/R/tables.R
@@ -216,15 +216,17 @@ find_temp_schema <- function(conn, fail_if_missing = TRUE) {
 }
 
 list_fields <- function(conn, id) {
-  query <- find_table(conn, id, "columns", only_first = TRUE)
+  name <- id@name
+
+  query <- find_table(conn, name, "columns", only_first = TRUE)
   query <- paste0(
     "SELECT column_name FROM ",
     query, " ",
     "ORDER BY ordinal_position"
   )
   fields <- dbGetQuery(conn, query)[[1]]
   if (length(fields) == 0) {
-    stop("Table ", dbQuoteIdentifier(conn, id), " not found.", call. = FALSE)
+    stop("Table ", dbQuoteIdentifier(conn, name), " not found.", call. = FALSE)
   }
   fields
 }