resolve merge conflicts in #108

Merge branch 'issue107' into dev # Conflicts: # DESCRIPTION # tests/testthat/test-all.R
Chicago · Oct 19, 2016 · 1cd6399 · 1cd6399
2 parents f68ad54 + 255b49b
commit 1cd6399
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,8 +10,8 @@ Description: Provides easier interaction with
     format and manages throttling by 'Socrata'.
     Users can upload data to Socrata portals directly
     from R.
-Version: 1.7.1-16
-Date: 2016-10-06
+Version: 1.7.1-17
+Date: 2016-10-19
 Author: Hugh Devlin, Ph. D., Tom Schenk, Jr., and John Malc
 Maintainer: "Tom Schenk Jr." <developers@cityofchicago.org>
 Depends:

diff --git a/R/RSocrata.R b/R/RSocrata.R
@@ -289,6 +289,11 @@ read.socrata <- function(url, app_token = NULL, email = NULL, password = NULL,
   for(columnName in colnames(result)[!is.na(dataTypes[fieldName(colnames(result))]) & dataTypes[fieldName(colnames(result))] == 'money']) {
     result[[columnName]] <- no_deniro(result[[columnName]])
   }
+	# convert logical fields to character
+	for(columnName in colnames(result)) {
+	  if(typeof(result[,columnName]) == "logical")
+	    result[,columnName] <- as.character(result[,columnName])
+	}
   if(stringsAsFactors){
 	  result <- data.frame(unclass(result), stringsAsFactors = stringsAsFactors)
 	}

diff --git a/tests/testthat/test-all.R b/tests/testthat/test-all.R
@@ -136,7 +136,7 @@ test_that("read Socrata JSON as default", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("POSIXct", "character", "character", "character", "character", 
-                 "character", "logical", "character", "character", "character", 
+                 "character", "character", "character", "character", "character", 
                  "character"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })
@@ -148,7 +148,7 @@ test_that("read Socrata JSON as character", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("POSIXct", "character", "character", "character", "character", 
-                 "character", "logical", "character", "character", "character", 
+                 "character", "character", "character", "character", "character", 
                  "character"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })
@@ -160,7 +160,7 @@ test_that("read Socrata JSON as factor", {
   expect_equal(1007, nrow(df), label="rows")
   expect_equal(11, ncol(df), label="columns")
   expect_equal(c("POSIXct", "factor", "factor", "factor", "factor", "factor", 
-                 "logical", "factor", "factor", "factor", "factor"), 
+                 "factor", "factor", "factor", "factor", "factor"), 
                unname(sapply(sapply(df, class),`[`, 1)))
 })