refactor data parsing to fix #31

cloudyr · Mar 2, 2017 · 439ea30 · 439ea30
1 parent be956e2
commit 439ea30
Show file tree

Hide file tree

Showing 31 changed files with 27 additions and 37 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -25,5 +25,5 @@ Suggests:
     knitr,
     rmarkdown,
     testthat
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
 VignetteBuilder: knitr
diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,7 @@
 * Add support for standard SQL (#21)
 * Add support for hms/timestamp class uploads (#27)
 * Add support for partitioned tables (#28)
+* Fix bug that only returned one row for single column queries (#31 - thanks Rob)
 
 
 # bigQueryR 0.2.0 (CRAN)

diff --git a/R/dataParseFunctions.R b/R/dataParseFunctions.R
@@ -13,19 +13,25 @@ parse_bqr_query <- function(x){
   )
 
   schema <- x$schema$fields
-
-  template <- x$rows$f[[1]]$v
-
-  data_f <- as.data.frame(t(vapply(x$rows$f, function(x) x$v, template)), stringsAsFactors = FALSE)
+
+  ## ffs
+  data_f <- as.data.frame(matrix(unlist(unlist(x$rows)), 
+                                 ncol = length(schema$name),
+                                 byrow = TRUE), 
+                          stringsAsFactors = FALSE)
 
   types <- tolower(schema$type)
 
-  out <- vector("list", length(types))
-  for(i in seq_along(types)){
-    ## this needs to behave when only length 1
-    out[[i]] <- converter[[types[i]]](data_f[[i]])
+  converter_funcs <- converter[types]
+
+  for(i in seq_along(converter_funcs)){
+
+    data_f[,i] <- converter_funcs[[i]](data_f[, i])
   }
-  names(out) <- schema$name
+
+  names(data_f) <- schema$name
+
+  out <- data_f
 
   out <- as.data.frame(out, stringsAsFactors = FALSE)
   attr(out, "jobReference") <- x$jobReference

diff --git a/man/bigQueryR.Rd b/man/bigQueryR.Rd
diff --git a/man/bqr_auth.Rd b/man/bqr_auth.Rd
diff --git a/man/bqr_create_table.Rd b/man/bqr_create_table.Rd
diff --git a/man/bqr_delete_table.Rd b/man/bqr_delete_table.Rd
diff --git a/man/bqr_download_extract.Rd b/man/bqr_download_extract.Rd
diff --git a/man/bqr_extract_data.Rd b/man/bqr_extract_data.Rd
diff --git a/man/bqr_get_job.Rd b/man/bqr_get_job.Rd
diff --git a/man/bqr_grant_extract_access.Rd b/man/bqr_grant_extract_access.Rd
diff --git a/man/bqr_list_datasets.Rd b/man/bqr_list_datasets.Rd
diff --git a/man/bqr_list_jobs.Rd b/man/bqr_list_jobs.Rd
diff --git a/man/bqr_list_projects.Rd b/man/bqr_list_projects.Rd
diff --git a/man/bqr_list_tables.Rd b/man/bqr_list_tables.Rd
diff --git a/man/bqr_partition.Rd b/man/bqr_partition.Rd
diff --git a/man/bqr_query.Rd b/man/bqr_query.Rd
diff --git a/man/bqr_query_asynch.Rd b/man/bqr_query_asynch.Rd
diff --git a/man/bqr_table_data.Rd b/man/bqr_table_data.Rd
diff --git a/man/bqr_table_meta.Rd b/man/bqr_table_meta.Rd
diff --git a/man/bqr_upload_data.Rd b/man/bqr_upload_data.Rd
diff --git a/man/bqr_wait_for_job.Rd b/man/bqr_wait_for_job.Rd
diff --git a/man/error.message.Rd b/man/error.message.Rd
diff --git a/man/gcs_update_acl.Rd b/man/gcs_update_acl.Rd
diff --git a/man/idempotency.Rd b/man/idempotency.Rd
diff --git a/man/is.NullOb.Rd b/man/is.NullOb.Rd
diff --git a/man/is.error.Rd b/man/is.error.Rd
diff --git a/man/myMessage.Rd b/man/myMessage.Rd
diff --git a/man/parse_bqr_query.Rd b/man/parse_bqr_query.Rd
diff --git a/man/rmNullObs.Rd b/man/rmNullObs.Rd
diff --git a/tests/testthat/test_query.R b/tests/testthat/test_query.R
@@ -22,4 +22,14 @@ test_that("Can query test set", {
   expect_equal(as.Date(result$Date), test_data$Date)
   expect_equal(result$ID, test_data$ID)
 
+})
+
+test_that("Single query bug", {
+
+  result <- bqr_query("big-query-r","samples",
+                      "SELECT repository.url FROM [publicdata:samples.github_nested] LIMIT 10")
+
+  ## should be 10, not 1
+  expect_equal(nrow(result), 10)
+
 })