Merge pull request #327 from r-dbi/b-321-names

feat!: Avoid appending a numeric suffix to duplicate column names
r-dbi · Apr 1, 2024 · 12006db · 12006db
2 parents b1e58bd + fd72203
commit 12006db
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 35 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -102,7 +102,6 @@ Collate:
     'dbWriteTable_MariaDBConnection_character_data.frame.R'
     'default.R'
     'export.R'
-    'names.R'
     'query.R'
     'quote.R'
     'show_MariaDBConnection.R'

diff --git a/R/dbColumnInfo_MariaDBResult.R b/R/dbColumnInfo_MariaDBResult.R
@@ -2,7 +2,6 @@
 #' @usage NULL
 dbColumnInfo_MariaDBResult <- function(res, ...) {
   df <- result_column_info(res@ptr)
-  df$name <- tidy_names(df$name)
   df
 }
 

diff --git a/R/dbFetch_MariaDBResult.R b/R/dbFetch_MariaDBResult.R
@@ -51,7 +51,7 @@ dbFetch_MariaDBResult <- function(res, n = -1, ..., row.names = FALSE) {
   ret <- fix_timezone(ret, res@conn)
   ret <- fix_blob(ret)
   ret <- sqlColumnToRownames(ret, row.names)
-  set_tidy_names(ret)
+  ret
 }
 
 #' @rdname query

diff --git a/R/names.R b/R/names.R