Merge pull request #17 from Arkoniak/arrays

fixed small timetables bugs
JuliaQuant · Apr 8, 2021 · 715fdc6 · 715fdc6 · Arkoniak · Apr 8, 2021
2 parents 6f5e4db + f5a8426
commit 715fdc6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Timestamps"
 uuid = "0123453a-27b6-4e80-93fe-c2c00e33fefb"
 authors = ["Andrey Oskin and contributors <https://github.com/JuliaQuant/Timestamps.jl/graphs/contributors>"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/tables.jl b/src/tables.jl
@@ -51,6 +51,9 @@ Tables.getcolumn(mci::TimestampArrayTableColsIterator, nm::Symbol) = Tables.getc
 # Ok, this one is experimental and probably should be moved to a different package
 istimetable(::T) where T = istimetable(T)
 istimetable(::Type{T}) where T = false
+timeaxis(::T) where T = timeaxis(T)
+timeaxis(::Type{T}) where T = :timestamp
+
 istimetable(::Type{<:TimestampArray}) = true
 timeaxis(x::TimestampArray) = :timestamp
 
@@ -66,9 +69,9 @@ function TimestampArray(x; timestamp = :timestamp)
     end
     rows = Tables.rows(x)
     tsps = map(rows) do row
-        rt = ntuple(i -> row[indx[i]], length(row) - 1)
-        Timestamp(getproperty(row, tscol), rt)
+        rt = ntuple(i -> Tables.getcolumn(row, indx[i]), length(row) - 1)
+        Timestamp(Tables.getcolumn(row, tscol), rt)
     end
 
-    return TimestampArray(tsps, names[indx])
+    return TimestampArray(tsps, collect(names[indx]))
 end