Skip to content

Fix for #157 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 26, 2014
Merged

Fix for #157 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c4f399
Merge branch 'release/2.6.0'
Nov 29, 2013
3a83d9d
Pump version to 2.6.1 which fixes #22
Dec 21, 2013
eb633bc
Merge branch 'release/2.6.1'
Dec 21, 2013
c3e75ee
FIX #157
orbanbotond Dec 27, 2013
4f5cc51
merge from origin gemspec
orbanbotond Dec 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions annotate.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# This file is auto-generated!
# DO NOT EDIT THIS FILE DIRECTLY!
# Instead, edit the Rakefile and run 'rake gems:gemspec'.# -*- encoding: utf-8 -*-
# -*- encoding: utf-8 -*-
# stub: annotate 2.6.1 ruby lib

Gem::Specification.new do |s|
Expand Down
5 changes: 5 additions & 0 deletions lib/annotate/annotate_models.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ def get_schema_info(klass, header, options = {})
end
end

# Check out if we got an array column
if col.respond_to?(:array) && col.array
attrs << "is an Array"
end

# Check out if we got a geometric column
# and print the type and SRID
if col.respond_to?(:geometry_type)
Expand Down