Merge branch 'release/v2.6.10'

ctran · May 22, 2015 · 0146ee7 · 0146ee7
2 parents 1de5bfb + bcd2e8c
commit 0146ee7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
@@ -140,7 +140,7 @@ def get_schema_info(klass, header, options = {})
         attrs << "not null" unless col.null
         attrs << "primary key" if klass.primary_key && (klass.primary_key.is_a?(Array) ? klass.primary_key.collect{|c|c.to_sym}.include?(col.name.to_sym) : col.name.to_sym == klass.primary_key.to_sym)
 
-        col_type = (col.sql_type || col.type).to_s
+        col_type = (col.type || col.sql_type).to_s
         if col_type == "decimal"
           col_type << "(#{col.precision}, #{col.scale})"
         elsif col_type != "spatial"

diff --git a/lib/annotate/version.rb b/lib/annotate/version.rb
@@ -1,5 +1,5 @@
 module Annotate
   def self.version
-    '2.6.9'
+    '2.6.10'
   end
 end
diff --git a/spec/annotate/annotate_models_spec.rb b/spec/annotate/annotate_models_spec.rb
@@ -45,7 +45,7 @@ def mock_column(name, type, options={})
 
     stubs = default_options.dup
     stubs.merge!(options)
-    stubs.merge!(:name => name, :sql_type => type, :type => type)
+    stubs.merge!(:name => name, :type => type)
 
     double("Column", stubs)
   end