Merge commit '85eab1248145eb4891db58b36f555b5e5184d37f'

#Conflicts: # NEWS.md
r-dbi · Nov 7, 2023 · b200d9b · b200d9b
2 parents 2d7648b + 85eab12
commit b200d9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,9 @@
 
 * Now supports `dbAppendTable()` (#539) and `dbCreateTable()` (#483).
 
+* `dbWriteTable()` now correct uses the `billing` value set in the 
+  connection (#486).
+
 * `dbReadTable()`, `dbWriteTable()`, `dbExistsTable()`, `dbRemoveTable()`,
   and `dbListFields()` now all work with `DBI::Id()` (#537).
 

diff --git a/R/dbi-connection.R b/R/dbi-connection.R
@@ -1,13 +1,14 @@
 #' @include dbi-driver.R
 NULL
 
-BigQueryConnection <-
-  function(project, dataset, billing,
+BigQueryConnection <- function(project,
+           dataset,
+           billing,
            page_size = 1e4,
            quiet = NA,
            use_legacy_sql = FALSE,
            bigint = c("integer", "integer64", "numeric", "character")) {
-  ret <- new("BigQueryConnection",
+  new("BigQueryConnection",
     project = project,
     dataset = dataset,
     billing = billing,
@@ -16,7 +17,6 @@ BigQueryConnection <-
     use_legacy_sql = use_legacy_sql,
     bigint = match.arg(bigint)
   )
-  ret
 }
 
 #' @rdname DBI
@@ -180,9 +180,12 @@ dbWriteTable_bq <- function(conn,
   }
   tb <- as_bq_table(conn, name)
 
-  bq_table_upload(tb, value,
+  bq_table_upload(
+    tb,
+    value,
     create_disposition = create_disposition,
     write_disposition = write_disposition,
+    billing = conn@billing,
     ...
   )
   invisible(TRUE)