Merge pull request #40 from queryverse/vectorstring

Force Vector{String} instead of StringVector
queryverse · Jan 15, 2019 · 65ebaba · 65ebaba
2 parents bbda88e + 88bbfd8
commit 65ebaba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# CSVFiles.jl v0.13.0
+* Never use StringVector, always use Vector{String} instead
+
 # CSVFiles.jl v0.12.0
 * Export FileIO.File and FileIO.@format_str
 

diff --git a/REQUIRE b/REQUIRE
@@ -1,5 +1,5 @@
 julia 0.7
-TextParse 0.6.0
+TextParse 0.7.0
 IteratorInterfaceExtensions 0.1.1
 TableTraits 0.4.0
 TableTraitsUtils 0.2.1

diff --git a/src/CSVFiles.jl b/src/CSVFiles.jl
@@ -66,9 +66,9 @@ function _loaddata(file)
     if startswith(file.filename, "https://") || startswith(file.filename, "http://")
         response = HTTP.get(file.filename)
         data = String(response.body)
-        return TextParse._csvread(data, file.delim; file.keywords...)
+        return TextParse._csvread(data, file.delim; stringarraytype=Array, file.keywords...)
     else
-        return csvread(file.filename, file.delim; file.keywords...)
+        return csvread(file.filename, file.delim; stringarraytype=Array, file.keywords...)
     end
 end
 
@@ -86,15 +86,15 @@ function TableTraits.get_columns_copy_using_missing(file::CSVFile)
 end
 
 function TableTraits.getiterator(s::CSVStream)
-    res = TextParse.csvread(s.io, s.delim; s.keywords...)
+    res = TextParse.csvread(s.io, s.delim; stringarraytype=Array, s.keywords...)
 
     it = TableTraitsUtils.create_tableiterator([i for i in res[1]], [Symbol(i) for i in res[2]])
 
     return it
 end
 
 function TableTraits.get_columns_copy_using_missing(s::CSVStream)
-    columns, colnames = TextParse.csvread(s.io, s.delim, s.keywords...)
+    columns, colnames = TextParse.csvread(s.io, s.delim; stringarraytype=Array, s.keywords...)
     return NamedTuple{(Symbol.(colnames)...,), Tuple{typeof.(columns)...}}((columns...,))
 end