Fixes for v0.5 (#10)

* Fixes for v0.5 * Add v0.5 to Travis * Add Compat to REQUIRE
JuliaDatabases · Sep 21, 2016 · 5401f42 · 5401f42
1 parent 67afa1e
commit 5401f42
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ os:
   - osx
 julia:
   - 0.4
+  - 0.5
   - nightly
 notifications:
   email: false

diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,4 @@
 julia 0.4
 Reexport
 Iterators
+Compat 0.8.4
diff --git a/src/arrays.jl b/src/arrays.jl
@@ -2,6 +2,7 @@ module ArrayInterfaces
 
 import Base: connect, close, getindex, start, next, done, length, isopen, isempty
 importall ..DBAPIBase
+import Compat.view
 
 
 ### Underlying column data structures
@@ -18,7 +19,7 @@ immutable SubColumn{T} <: AbstractColumn{T}
     data::SubArray{T}
 end
 
-SubColumn(column::Column, indices...) = SubColumn(column.name, sub(column.data, indices...))
+SubColumn(column::Column, indices...) = SubColumn(column.name, view(column.data, indices...))
 
 start(column::AbstractColumn) = start(column.data)
 next{T}(column::AbstractColumn{T}, state) = next(column.data, state)::Tuple{T, Any}
@@ -237,4 +238,11 @@ immutable ArrayInterfaceError{T<:AbstractString} <: DatabaseError{ColumnarArrayI
     message::T
 end
 
+if VERSION >= v"0.5-"
+    Base.iteratorsize(::ColumnarArrayRowIterator) = Base.SizeUnknown()
+    Base.iteratoreltype(::ColumnarArrayRowIterator) = Base.EltypeUnknown()
+    Base.iteratorsize(::ColumnarArrayColumnIterator) = Base.SizeUnknown()
+    Base.iteratoreltype(::ColumnarArrayColumnIterator) = Base.EltypeUnknown()
+end
+
 end  # module
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ os: @@
       - osx
     julia:
       - 0.4
+      - 0.5
       - nightly
     notifications:
       email: false
@@ Expand Down @@